mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-05 13:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #461 from andy5995/issue_422

Browse Source 
json_object.c:set errno in json_object_get_double()
This commit is contained in:
Eric Haszlakiewicz
2018-11-28 20:39:42 -05:00
committed by GitHub
parent 83cb93b7ae 506a32d4ab
commit 745cadc944
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
json_object.c
View File

@@ -951,7 +951,10 @@ double json_object_get_double(const struct json_object *jso)
/* if conversion stopped at the first character, return 0.0 */ /* if conversion stopped at the first character, return 0.0 */
if (errPtr == get_string_component(jso)) if (errPtr == get_string_component(jso))
return 0.0; {
errno = EINVAL;
return 0.0;
}
/* /*
* Check that the conversion terminated on something sensible * Check that the conversion terminated on something sensible
@@ -959,7 +962,10 @@ double json_object_get_double(const struct json_object *jso)
* For example, { "pay" : 123AB } would parse as 123. * For example, { "pay" : 123AB } would parse as 123.
*/ */
if (*errPtr != '\0') if (*errPtr != '\0')
return 0.0; {
errno = EINVAL;
return 0.0;
}
/* /*
* If strtod encounters a string which would exceed the * If strtod encounters a string which would exceed the
@@ -977,6 +983,7 @@ double json_object_get_double(const struct json_object *jso)
cdouble = 0.0; cdouble = 0.0;
return cdouble; return cdouble;
default: default:
errno = EINVAL;
return 0.0; return 0.0;
} }
} }

2
json_tokener.h
View File

@@ -122,7 +122,7 @@ const char *json_tokener_error_desc(enum json_tokener_error jerr);
* When parsing a JSON string in pieces, if the tokener is in the middle * When parsing a JSON string in pieces, if the tokener is in the middle
* of parsing this will return json_tokener_continue. * of parsing this will return json_tokener_continue.
* *
* See also json_tokener_error_desc(). * @see json_tokener_error_desc().
*/ */
JSON_EXPORT enum json_tokener_error json_tokener_get_error(struct json_tokener *tok); JSON_EXPORT enum json_tokener_error json_tokener_get_error(struct json_tokener *tok);