fix some possible errors

Origin commit data
------------------
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
This commit is contained in:
Jacek Jendrzej
2014-11-06 14:40:44 +01:00
parent 9d4fbf8584
commit 3905eb0fda
4 changed files with 7 additions and 5 deletions

View File

@@ -572,7 +572,7 @@ void readln(int fd, char *buf)
int parse_response(URL *url, void * /*opt*/, CSTATE *state) int parse_response(URL *url, void * /*opt*/, CSTATE *state)
{ {
char header[2049], /*str[255]*/ str[2048]; // combined with 2nd local str from id3 part char header[2048], /*str[255]*/ str[2048]; // combined with 2nd local str from id3 part
char *ptr, chr=0, lastchr=0; char *ptr, chr=0, lastchr=0;
int hlen = 0, response; int hlen = 0, response;
int meta_interval = 0, rval; int meta_interval = 0, rval;

View File

@@ -382,7 +382,7 @@ void CDBoxInfoWidget::paint()
now -= info.uptime; now -= info.uptime;
std::string str_boot(strftime(g_Locale->getText(LOCALE_EXTRA_DBOXINFO_TIMEFORMAT), now)); std::string str_boot(strftime(g_Locale->getText(LOCALE_EXTRA_DBOXINFO_TIMEFORMAT), now));
char ubuf[80] = { 0 }; char ubuf[256] = { 0 };
char sbuf[256] = { 0 }; char sbuf[256] = { 0 };
int updays, uphours, upminutes; int updays, uphours, upminutes;
@@ -392,14 +392,14 @@ void CDBoxInfoWidget::paint()
upminutes %= 60; upminutes %= 60;
if (updays) { if (updays) {
snprintf(ubuf, sizeof(sbuf), "%d day%s, ", updays, (updays != 1) ? "s" : ""); snprintf(ubuf, sizeof(ubuf), "%d day%s, ", updays, (updays != 1) ? "s" : "");
strcat(sbuf, ubuf); strcat(sbuf, ubuf);
} }
if (uphours) { if (uphours) {
snprintf(ubuf, sizeof(sbuf), "%d hour%s, ", uphours, (uphours != 1) ? "s" : ""); snprintf(ubuf, sizeof(ubuf), "%d hour%s, ", uphours, (uphours != 1) ? "s" : "");
strcat(sbuf, ubuf); strcat(sbuf, ubuf);
} }
snprintf(ubuf,sizeof(sbuf), "%d minute%s", upminutes, (upminutes != 1) ? "s" : ""); snprintf(ubuf,sizeof(ubuf), "%d minute%s", upminutes, (upminutes != 1) ? "s" : "");
strcat(sbuf, ubuf); strcat(sbuf, ubuf);
snprintf(ubuf, sizeof(ubuf), "%s: ", g_Locale->getText(LOCALE_EXTRA_DBOXINFO_LOAD)); snprintf(ubuf, sizeof(ubuf), "%s: ", g_Locale->getText(LOCALE_EXTRA_DBOXINFO_LOAD));

View File

@@ -469,6 +469,7 @@ void CLuaInstance::runScript(const char *fileName, const char *arg0, ...)
if (i >= 64) { if (i >= 64) {
fprintf(stderr, "CLuaInstance::runScript: too many arguments!\n"); fprintf(stderr, "CLuaInstance::runScript: too many arguments!\n");
args.clear(); args.clear();
va_end(list);
return; return;
} }
args.push_back(temp); args.push_back(temp);

View File

@@ -124,6 +124,7 @@ int my_system(int argc, const char *arg, ...)
if (i == argv_max) if (i == argv_max)
{ {
fprintf(stderr, "my_system: too many arguments!\n"); fprintf(stderr, "my_system: too many arguments!\n");
va_end(args);
return -1; return -1;
} }
argv[i] = va_arg(args, const char *); argv[i] = va_arg(args, const char *);