diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-01 12:57:28 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-01 12:57:28 -0700 |
| commit | 3e94de19cd2704afad1b989dad7496f1f10c42e8 (patch) | |
| tree | 25b49916ee1b9f75a0b847702d35dc50d1adac21 /src/core/lib | |
| parent | 5aceb2740849a0d36bc45fd807309f6e2fc0d2c2 (diff) | |
| parent | 3cba82ebafc315095b60872ad4fb28520732d7bd (diff) | |
Merge branch 'optionalize_resolvers' into optionalize_client_config
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/iomgr/tcp_client_windows.c | 3 | ||||
| -rw-r--r-- | src/core/lib/json/json_reader.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/tcp_client_windows.c b/src/core/lib/iomgr/tcp_client_windows.c index 1f0f2e3925..7d78beb15a 100644 --- a/src/core/lib/iomgr/tcp_client_windows.c +++ b/src/core/lib/iomgr/tcp_client_windows.c @@ -103,7 +103,8 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, bool from_iocp) { GPR_ASSERT(transfered_bytes == 0); if (!wsa_success) { char *utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "on_connect error: %s", utf8_message); + gpr_log(GPR_ERROR, "on_connect error connecting to '%s': %s", + ac->addr_name, utf8_message); gpr_free(utf8_message); } else { *ep = grpc_tcp_create(ac->socket, ac->addr_name); diff --git a/src/core/lib/json/json_reader.c b/src/core/lib/json/json_reader.c index d09cee54f2..bc04bccc65 100644 --- a/src/core/lib/json/json_reader.c +++ b/src/core/lib/json/json_reader.c @@ -180,6 +180,13 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) { case GRPC_JSON_STATE_VALUE_NUMBER_WITH_DECIMAL: case GRPC_JSON_STATE_VALUE_NUMBER_ZERO: case GRPC_JSON_STATE_VALUE_NUMBER_EPM: + if (reader->depth == 0) { + return GRPC_JSON_PARSE_ERROR; + } else if ((c == '}') && !reader->in_object) { + return GRPC_JSON_PARSE_ERROR; + } else if ((c == ']') && !reader->in_array) { + return GRPC_JSON_PARSE_ERROR; + } success = (uint32_t)json_reader_set_number(reader); if (!success) return GRPC_JSON_PARSE_ERROR; json_reader_string_clear(reader); @@ -195,8 +202,10 @@ grpc_json_reader_status grpc_json_reader_run(grpc_json_reader *reader) { } if (reader->in_object) { reader->state = GRPC_JSON_STATE_OBJECT_KEY_BEGIN; - } else { + } else if (reader->in_array) { reader->state = GRPC_JSON_STATE_VALUE_BEGIN; + } else { + return GRPC_JSON_PARSE_ERROR; } } else { if (reader->depth-- == 0) return GRPC_JSON_PARSE_ERROR; |