From a7b8b69d23b16b7ccd8d6cffcccef5ca3683be6b Mon Sep 17 00:00:00 2001
From: Nicolas Noble <nnoble@google.com>
Date: Mon, 23 Feb 2015 10:28:00 -0800
Subject: [PATCH] Addressing security concerns.
-) 0x7f (Backspace) isn't a printable character.
-) use sizeof(var) instead of sizeof(type).
---
src/core/json/json.c | 4 ++--
src/core/json/json_reader.c | 2 +-
src/core/json/json_writer.c | 9 +++++----
test/core/json/json_test.c | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/core/json/json.c b/src/core/json/json.c
index df7108a94d..96e11eebb1 100644
--- a/src/core/json/json.c
+++ b/src/core/json/json.c
@@ -38,8 +38,8 @@
#include "src/core/json/json.h"
grpc_json *grpc_json_create(grpc_json_type type) {
- grpc_json *json = gpr_malloc(sizeof(grpc_json));
- memset(json, 0, sizeof(grpc_json));
+ grpc_json *json = gpr_malloc(sizeof(*json));
+ memset(json, 0, sizeof(*json));
json->type = type;
return json;
diff --git a/src/core/json/json_reader.c b/src/core/json/json_reader.c
index 774faa5f23..5ea4e9569c 100644
--- a/src/core/json/json_reader.c
+++ b/src/core/json/json_reader.c
@@ -93,7 +93,7 @@ static void json_reader_set_null(grpc_json_reader* reader) {
/* Call this function to initialize the reader structure. */
void grpc_json_reader_init(grpc_json_reader* reader,
grpc_json_reader_vtable* vtable, void* userdata) {
- memset(reader, 0, sizeof(grpc_json_reader));
+ memset(reader, 0, sizeof(*reader));
reader->vtable = vtable;
reader->userdata = userdata;
json_reader_string_clear(reader);
diff --git a/src/core/json/json_writer.c b/src/core/json/json_writer.c
index 4c0bf30780..a40bf1733e 100644
--- a/src/core/json/json_writer.c
+++ b/src/core/json/json_writer.c
@@ -51,7 +51,7 @@ static void json_writer_output_string_with_len(grpc_json_writer* writer, const c
void grpc_json_writer_init(grpc_json_writer* writer, int indent,
grpc_json_writer_vtable* vtable, void* userdata) {
- memset(writer, 0, sizeof(grpc_json_writer));
+ memset(writer, 0, sizeof(*writer));
writer->container_empty = 1;
writer->indent = indent;
writer->vtable = vtable;
@@ -77,7 +77,7 @@ static void json_writer_output_indent(
while (spaces >= (sizeof(spacesstr) - 1)) {
json_writer_output_string_with_len(writer, spacesstr,
- sizeof(spacesstr) - 1);
+ sizeof(spacesstr) - 1);
spaces -= (sizeof(spacesstr) - 1);
}
@@ -117,10 +117,10 @@ static void json_writer_escape_string(grpc_json_writer* writer,
gpr_uint8 c = (gpr_uint8)*string++;
if (c == 0) {
break;
- } else if ((c >= 32) && (c <= 127)) {
+ } else if ((c >= 32) && (c <= 126)) {
if ((c == '\\') || (c == '"')) json_writer_output_char(writer, '\\');
json_writer_output_char(writer, c);
- } else if (c < 32) {
+ } else if ((c < 32) || (c == 127)) {
switch (c) {
case '\b':
json_writer_output_string_with_len(writer, "\\b", 2);
@@ -161,6 +161,7 @@ static void json_writer_escape_string(grpc_json_writer* writer,
for (i = 0; i < extra; i++) {
utf32 <<= 6;
c = *string++;
+ /* Breaks out and bail on any invalid UTF-8 sequence, including \0. */
if ((c & 0xc0) != 0x80) {
valid = 0;
break;
diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c
index 0e315e51ee..bc3c7a3da8 100644
--- a/test/core/json/json_test.c
+++ b/test/core/json/json_test.c
@@ -65,7 +65,7 @@ static testing_pair testing_pairs[] = {
/* Testing nested empty containers. */
{ " [ [ ] , { } , [ ] ] ", "[[],{},[]]", },
/* Testing escapes and control chars in key strings. */
- { " { \"\\n\\\\a , b\": 1, \"\": 0 } ", "{\"\\n\\\\a , b\":1,\"\":0}" },
+ { " { \"\x7f\\n\\\\a , b\": 1, \"\": 0 } ", "{\"\\u007f\\n\\\\a , b\":1,\"\":0}" },
/* Testing the writer's ability to cut off invalid UTF-8 sequences. */
{ "\"abc\xf0\x9d\x24\"", "\"abc\"" },
{ "\"\xff\"", "\"\"" },
--
GitLab