X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fini.c;h=826d9afa36c0268b331af2b45693242a06ed762f;hb=f37d0f861f20a72a0b77fb43fa27744521dd7995;hp=7b2a4b6530ac478434021edc0b65ea13a13c51df;hpb=4900d3cd9c4accc131a6a79986151cf3e6236031;p=lttng-tools.git diff --git a/src/common/config/ini.c b/src/common/config/ini.c index 7b2a4b653..826d9afa3 100644 --- a/src/common/config/ini.c +++ b/src/common/config/ini.c @@ -3,7 +3,9 @@ * * The "inih" library is distributed under the New BSD license: * - * Copyright (c) 2009, Brush Technology - All rights reserved. + * Copyright (C) 2009 Brush Technology - All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -31,7 +33,6 @@ * http://code.google.com/p/inih/ */ -#define _GNU_SOURCE #include #include #include @@ -83,7 +84,7 @@ static char* find_char_or_comment(const char* s, char c) /* Version of strncpy that ensures dest (size bytes) is null-terminated. */ static char* strncpy0(char* dest, const char* src, size_t size) { - strncpy(dest, src, size); + strncpy(dest, src, size - 1); dest[size - 1] = '\0'; return dest; } @@ -109,7 +110,7 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user) int error = 0; #if !INI_USE_STACK - line = (char*)malloc(INI_MAX_LINE); + line = (char*)zmalloc(INI_MAX_LINE); if (!line) { return -2; }