summaryrefslogtreecommitdiff
path: root/src/metaflac/utils.c
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2019-09-15 12:03:56 +1000
committerErik de Castro Lopo <erikd@mega-nerd.com>2019-09-15 16:14:36 +1000
commit04974d271531d429384a6f124919ff64fbbefd81 (patch)
tree330baab536c2b9e8c79a7c69cbeccc6f7ec43b42 /src/metaflac/utils.c
parent2409f5f39ddb9a4f89603eb4ff8480fa7f0726b2 (diff)
downloadflac-04974d271531d429384a6f124919ff64fbbefd81.tar.gz
Fix a number of gcc 9.2 compiler warnings
Diffstat (limited to 'src/metaflac/utils.c')
-rw-r--r--src/metaflac/utils.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
index a653118e..75f42bbd 100644
--- a/src/metaflac/utils.c
+++ b/src/metaflac/utils.c
@@ -61,21 +61,22 @@ char *local_strdup(const char *source)
void local_strcat(char **dest, const char *source)
{
- size_t ndest, nsource;
+ size_t ndest, nsource, outlen;
FLAC__ASSERT(0 != dest);
FLAC__ASSERT(0 != source);
- ndest = *dest? strlen(*dest) : 0;
+ ndest = *dest ? strlen(*dest) : 0;
nsource = strlen(source);
+ outlen = ndest + nsource + 1;
if(nsource == 0)
return;
*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
- if(0 == *dest)
+ if(*dest == NULL)
die("out of memory growing string");
- safe_strncpy((*dest)+ndest, source, nsource + 1);
+ safe_strncat(*dest, source, outlen);
}
static inline int local_isprint(int c)