Skip to content

Commit

Permalink
fix some issues identified by cppcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
okbob committed Nov 24, 2021
1 parent 5ccca10 commit a3b15fd
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/args.c
Expand Up @@ -156,7 +156,7 @@ buildargv(const char *input, int *_argc, char *appname)
if (argc >= (maxargc - 1))
{
maxargc *= 2;
argv = (char **) realloc(argv, maxargc * sizeof (char *));
argv = (char **) srealloc(argv, maxargc * sizeof (char *));
argv[argc] = NULL;
}

Expand Down Expand Up @@ -524,7 +524,7 @@ readargs(char **argv,
case 31:
{
char *nullstr;
int size;
int size = strlen(optarg);

nullstr = trim_quoted_str(optarg, &size);
if (size > 255)
Expand Down
6 changes: 6 additions & 0 deletions src/pretty-csv.c
Expand Up @@ -1470,6 +1470,8 @@ read_and_format(Options *opts, DataDesc *desc, StateData *state)
if (query != opts->query)
free(query);

free(linebuf.buffer);

return false;
}
}
Expand All @@ -1478,6 +1480,8 @@ read_and_format(Options *opts, DataDesc *desc, StateData *state)
if (!f_data)
{
format_error("missing data");
free(linebuf.buffer);

return false;
}

Expand All @@ -1494,6 +1498,8 @@ read_and_format(Options *opts, DataDesc *desc, StateData *state)
if (!f_data)
{
format_error("missing data");
free(linebuf.buffer);

return false;
}

Expand Down
6 changes: 3 additions & 3 deletions src/pspg.c
Expand Up @@ -1991,10 +1991,10 @@ export_to_file(PspgCommand command,
rows = (int) percent;
percent = 0.0;
}
}

strncpy(last_rows_number, number, sizeof(last_rows_number) - 1);
last_rows_number[sizeof(last_rows_number) - 1] = '\0';
strncpy(last_rows_number, number, sizeof(last_rows_number) - 1);
last_rows_number[sizeof(last_rows_number) - 1] = '\0';
}
}

if (copy_to_file)
Expand Down
12 changes: 10 additions & 2 deletions src/table.c
Expand Up @@ -436,9 +436,17 @@ _getline(char **lineptr, size_t *n, FILE *fp, bool is_nonblocking, bool wait_on_

if (dynbuf)
{
dynbuf = realloc(dynbuf, fetched_chars + len + 1);
if (!dynbuf)
char *_dynbuf;

_dynbuf = realloc(dynbuf, fetched_chars + len + 1);
if (!_dynbuf)
{
free(_dynbuf);
return -1;
}
else
dynbuf = _dynbuf;

memcpy(dynbuf + fetched_chars, statbuf, len + 1);
fetched_chars += len;
}
Expand Down
2 changes: 2 additions & 0 deletions src/theme_loader.c
Expand Up @@ -458,6 +458,8 @@ theme_loader(FILE *theme,
PspgThemeElement te;

te.attr = 0;
te.fg = PspgWhite;
te.bg = PspgBlack;

_token = ThemeLoaderGetToken(&tokenizer, &token);
if (_token)
Expand Down

0 comments on commit a3b15fd

Please sign in to comment.