Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5803 from nicolasnoble/what-the-fuzz

Browse Source 
Fixing json parsing issues detected by libfuzz.
pull/7626/head
Nicolas Noble 8 years ago committed by GitHub
parent 1e6e21b745 18c71117b0
commit eedc335580
2 changed files with 10 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/core/lib/json/json_reader.c
  2. 2
      test/core/json/json_test.c

14
src/core/lib/json/json_reader.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright 2015, Google Inc. * Copyright 2015-2016, Google Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -171,8 +171,9 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) {
switch (reader->state) { switch (reader->state) {
case GRPC_JSON_STATE_OBJECT_KEY_STRING: case GRPC_JSON_STATE_OBJECT_KEY_STRING:
case GRPC_JSON_STATE_VALUE_STRING: case GRPC_JSON_STATE_VALUE_STRING:
if (reader->unicode_high_surrogate != 0) if (reader->unicode_high_surrogate != 0) {
return GRPC_JSON_PARSE_ERROR; return GRPC_JSON_PARSE_ERROR;
}
json_reader_string_add_char(reader, c); json_reader_string_add_char(reader, c);
break; break;
@ -289,8 +290,9 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) {
break; break;
case GRPC_JSON_STATE_OBJECT_KEY_STRING: case GRPC_JSON_STATE_OBJECT_KEY_STRING:
if (reader->unicode_high_surrogate != 0) if (reader->unicode_high_surrogate != 0) {
return GRPC_JSON_PARSE_ERROR; return GRPC_JSON_PARSE_ERROR;
}
if (c == '"') { if (c == '"') {
reader->state = GRPC_JSON_STATE_OBJECT_KEY_END; reader->state = GRPC_JSON_STATE_OBJECT_KEY_END;
json_reader_set_key(reader); json_reader_set_key(reader);
@ -302,8 +304,9 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) {
break; break;
case GRPC_JSON_STATE_VALUE_STRING: case GRPC_JSON_STATE_VALUE_STRING:
if (reader->unicode_high_surrogate != 0) if (reader->unicode_high_surrogate != 0) {
return GRPC_JSON_PARSE_ERROR; return GRPC_JSON_PARSE_ERROR;
}
if (c == '"') { if (c == '"') {
reader->state = GRPC_JSON_STATE_VALUE_END; reader->state = GRPC_JSON_STATE_VALUE_END;
json_reader_set_string(reader); json_reader_set_string(reader);
@ -383,8 +386,9 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) {
} else { } else {
reader->state = GRPC_JSON_STATE_VALUE_STRING; reader->state = GRPC_JSON_STATE_VALUE_STRING;
} }
if (reader->unicode_high_surrogate && c != 'u') if (reader->unicode_high_surrogate && c != 'u') {
return GRPC_JSON_PARSE_ERROR; return GRPC_JSON_PARSE_ERROR;
}
switch (c) { switch (c) {
case '"': case '"':
case '/': case '/':

2
test/core/json/json_test.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright 2015, Google Inc. * Copyright 2015-2016, Google Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

Write Preview
Loading…
Cancel
Save