GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Don't use strdup but the xtrystrdup wrapper.

Browse Source 
* src/gpgme-json.c (create_keylist_patterns): Use CNT as first arg for
xcalloc.
(process_request): s/strdup/xtrystrdup/.
--

calloc takes two arguments so to be able to detect integer overflow.
Thus if we switch from malloc to calloc we should utilize that.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-07-19 09:46:57 +02:00
parent f42cd70f18
commit af2c74d6c0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gpgme-json.c
View File

@ -701,7 +701,7 @@ create_keylist_patterns (cjson_t request, const char *name)
if (*p == '\n') if (*p == '\n')
cnt++; cnt++;
ret = xcalloc (1, cnt * sizeof *ret); ret = xcalloc (cnt, sizeof *ret);
for (p = keystring, tmp = keystring; *p; p++) for (p = keystring, tmp = keystring; *p; p++)
{ {
@ -3214,8 +3214,11 @@ process_request (const char *request)
res = encode_and_chunk (json, response); res = encode_and_chunk (json, response);
if (!res) if (!res)
{ {
log_error ("Printing JSON data failed\n"); cjson_t err_obj;
cjson_t err_obj = error_object (NULL, "Printing JSON data failed");
log_error ("printing JSON data failed\n");
err_obj = error_object (NULL, "Printing JSON data failed");
if (opt_interactive) if (opt_interactive)
res = cJSON_Print (err_obj); res = cJSON_Print (err_obj);
res = cJSON_PrintUnformatted (err_obj); res = cJSON_PrintUnformatted (err_obj);
@ -3228,7 +3231,7 @@ process_request (const char *request)
if (!res) if (!res)
{ {
/* Can't happen unless we created a broken error_object above */ /* Can't happen unless we created a broken error_object above */
return strdup ("Bug: Fatal error in process request\n"); return xtrystrdup ("Bug: Fatal error in process request\n");
} }
return res; return res;
} }
@ -3626,7 +3629,7 @@ native_messaging_repl (void)
} }
else /* Process request */ else /* Process request */
{ {
request[n] = '\0'; /* Esnure that request has an end */ request[n] = '\0'; /* Ensure that request has an end */
if (opt_debug) if (opt_debug)
log_debug ("request='%s'\n", request); log_debug ("request='%s'\n", request);
xfree (response); xfree (response);