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

json: Fix crash by ensuring response is never NULL

Browse Source 
* src/gpgme-json.c (encode_and_chunk): Try to always
return at least an error.
(process_request): Double check that it does not return NULL.

--
If process_request returns NULL the following strlen on it
would crash.
This commit is contained in:
Andre Heinecke 2018-07-18 13:02:32 +02:00
parent b78140daf7
commit 82e4b900a9
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/gpgme-json.c
View File

@ -1473,13 +1473,28 @@ encode_and_chunk (cjson_t request, cjson_t response)
data = cJSON_PrintUnformatted (response); data = cJSON_PrintUnformatted (response);
if (!data) if (!data)
goto leave; {
err = GPG_ERR_NO_DATA;
goto leave;
}
if (!request)
{
err = GPG_ERR_INV_VALUE;
goto leave;
}
if ((err = get_chunksize (request, &chunksize))) if ((err = get_chunksize (request, &chunksize)))
goto leave; {
err = GPG_ERR_INV_VALUE;
goto leave;
}
if (!chunksize) if (!chunksize)
goto leave; {
err = GPG_ERR_INV_VALUE;
goto leave;
}
pending_data.buffer = data; pending_data.buffer = data;
/* Data should already be encoded so that it does not /* Data should already be encoded so that it does not
@ -1500,14 +1515,22 @@ encode_and_chunk (cjson_t request, cjson_t response)
leave: leave:
xfree (getmore_request); xfree (getmore_request);
if (!err && !data)
{
err = GPG_ERR_GENERAL;
}
if (err) if (err)
{ {
cjson_t err_obj = gpg_error_object (NULL, err, cjson_t err_obj = gpg_error_object (NULL, err,
"Encode and chunk failed: %s", "Encode and chunk failed: %s",
gpgme_strerror (err)); gpgme_strerror (err));
xfree (data);
if (opt_interactive) if (opt_interactive)
return cJSON_Print (err_obj); data = cJSON_Print (err_obj);
return cJSON_PrintUnformatted (err_obj); data = cJSON_PrintUnformatted (err_obj);
cJSON_Delete (err_obj);
} }
return data; return data;
@ -3187,13 +3210,26 @@ process_request (const char *request)
else else
res = cJSON_PrintUnformatted (response); res = cJSON_PrintUnformatted (response);
} }
else if (json) else
res = encode_and_chunk (json, response); res = encode_and_chunk (json, response);
if (!res) if (!res)
log_error ("Printing JSON data failed\n"); {
log_error ("Printing JSON data failed\n");
cjson_t err_obj = error_object (NULL, "Printing JSON data failed");
if (opt_interactive)
res = cJSON_Print (err_obj);
res = cJSON_PrintUnformatted (err_obj);
cJSON_Delete (err_obj);
}
cJSON_Delete (json); cJSON_Delete (json);
cJSON_Delete (response); cJSON_Delete (response);
if (!res)
{
/* Can't happen unless we created a broken error_object above */
return strdup ("Bug: Fatal error in process request\n");
}
return res; return res;
} }