From: Michael Tremer Date: Thu, 5 Oct 2023 09:58:25 +0000 (+0000) Subject: libpakfire: Initialize strings correctly X-Git-Tag: 0.9.30~1542 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2932624b6c363a8d3337f411e7a1b38d82967c07;p=pakfire.git libpakfire: Initialize strings correctly Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index dbe5298a8..c94f3f9ff 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -1477,7 +1477,7 @@ PAKFIRE_EXPORT struct pakfire_repo* pakfire_package_get_repo(struct pakfire_pack static void pakfire_package_dump_add_line(char** str, const char* key, const char* val) { if (val) - asprintf(str, "%s%-15s: %s\n", *str, key ? key : "", val); + asprintf(str, "%s%-15s: %s\n", (*str) ? *str : "", key ? key : "", val); } static void pakfire_package_dump_add_lines(char** str, const char* key, char** lines) { @@ -1551,7 +1551,7 @@ static int pakfire_sort_dependencies(const void* p1, const void* p2) { } PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags) { - char* string = ""; + char* string = NULL; // Name const char* name = pakfire_package_get_string(pkg, PAKFIRE_PKG_NAME); diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 19a88469f..c80e3138b 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -520,7 +520,7 @@ static int pakfire_transaction_append_problems( static char* pakfire_transaction_get_problem_string( struct pakfire_transaction* transaction, int flags) { struct pakfire_problem** problems = NULL; - char* buffer = ""; + char* buffer = NULL; int r; // Fetch any problems @@ -946,7 +946,7 @@ static int pakfire_transaction_add_separator(char** s, size_t width) { // Write line of = for (unsigned int i = 0; i < width; i++) { - r = asprintf(s, "%s=", *s); + r = asprintf(s, "%s=", (*s) ? *s : ""); if (r < 0) return r; } @@ -972,7 +972,7 @@ static int pakfire_transaction_add_usage_line(char** s, size_t width, PAKFIRE_EXPORT char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t width) { char headline[1024]; - char* s = ""; + char* s = NULL; int r; Queue classes;