Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

64bit numbers #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

64bit numbers #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c80324a
Output strings for int64 and uint64 in json
Oct 13, 2019
5d9ddb8
Enhance json2protobuf handling of integer values
Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
234 changes: 195 additions & 39 deletions src/protobuf2json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <stdbool.h>
#include <inttypes.h>

/* Interface definitions */
#include "protobuf2json.h"
Expand Down Expand Up @@ -84,6 +86,8 @@ static int protobuf2json_process_field(
char *error_string,
size_t error_size
) {
char buf[32];

switch (field_descriptor->type) {
case PROTOBUF_C_TYPE_INT32:
case PROTOBUF_C_TYPE_SINT32:
Expand All @@ -97,11 +101,13 @@ static int protobuf2json_process_field(
case PROTOBUF_C_TYPE_INT64:
case PROTOBUF_C_TYPE_SINT64:
case PROTOBUF_C_TYPE_SFIXED64:
*json_value = json_integer(*(int64_t *)protobuf_value);
sprintf (buf, "%" PRId64, *(int64_t *)protobuf_value);
*json_value = json_string(buf);
break;
case PROTOBUF_C_TYPE_UINT64:
case PROTOBUF_C_TYPE_FIXED64:
*json_value = json_integer(*(uint64_t *)protobuf_value);
sprintf (buf, "%" PRIu64, *(uint64_t *)protobuf_value);
*json_value = json_string(buf);
break;
case PROTOBUF_C_TYPE_FLOAT:
*json_value = json_real(*(float *)protobuf_value);
Expand Down Expand Up @@ -449,71 +455,221 @@ static const char* json2protobuf_integer_name_by_c_type(ProtobufCType type) {
}
}

static int json2protobuf_process_field(
static bool json2protobuf_integer_within_range (
ProtobufCType type,
long long value
) {
switch (type) {
case PROTOBUF_C_TYPE_INT32:
case PROTOBUF_C_TYPE_SINT32:
case PROTOBUF_C_TYPE_SFIXED32:
if (value < INT32_MIN || value > INT32_MAX)
{
return false;
}
break;
case PROTOBUF_C_TYPE_UINT32:
case PROTOBUF_C_TYPE_FIXED32:
if (value < 0 || value > UINT32_MAX)
{
return false;
}
break;
case PROTOBUF_C_TYPE_INT64:
case PROTOBUF_C_TYPE_SINT64:
case PROTOBUF_C_TYPE_SFIXED64:
if (value < INT64_MIN || value > INT64_MAX)
{
return false;
}
break;
case PROTOBUF_C_TYPE_UINT64:
case PROTOBUF_C_TYPE_FIXED64:
if (value < 0)
{
return false;
}
break;
default:
return false;
}
return true;
}

static int json2protobuf_process_uint64_field (
const ProtobufCFieldDescriptor *field_descriptor,
json_t *json_value,
void *protobuf_value,
char *error_string,
size_t error_size
) {
if (field_descriptor->type == PROTOBUF_C_TYPE_INT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SFIXED32
) {
if (!json_is_integer(json_value)) {
uint64_t value_uint64_t = 0;
long long llvalue = 0;
char *endp = NULL;

// if entered as a number, maximum value allowed through by jansson will be LLONG_MAX
// which is too small for full uint64_t, but will fit.
if (json_is_integer(json_value))
{
value_uint64_t = (uint64_t) json_integer_value (json_value);
// Used to check sign
llvalue = json_integer_value (json_value);
}
// proto 3 spec states that integers may be entered as strings or numbers
else if (json_is_string(json_value))
{
errno = 0;
value_uint64_t = strtoull (json_string_value (json_value), &endp, 10);

if (errno == ERANGE || *endp != '\0')
{
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer required for GPB %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type)
"JSON string not successfully converted to value for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}
// Used to check sign
llvalue = strtoll (json_string_value (json_value), &endp, 10);
}
else
{
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer or string required for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}

if (!json2protobuf_integer_within_range (field_descriptor->type, llvalue))
{
/* Number/string received was negative */
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not within range for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}

int32_t value_int32_t = (int32_t)json_integer_value(json_value);
memcpy(protobuf_value, &value_uint64_t, sizeof(value_uint64_t));

memcpy(protobuf_value, &value_int32_t, sizeof(value_int32_t));
} else if (field_descriptor->type == PROTOBUF_C_TYPE_UINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_FIXED32
) {
if (!json_is_integer(json_value)) {
return 0;
}

static int json2protobuf_process_integer_field (
const ProtobufCFieldDescriptor *field_descriptor,
json_t *json_value,
void *protobuf_value,
char *error_string,
size_t error_size
) {
int64_t llvalue = 0;
char *endp = NULL;

// Jansson can pass values up to LLONG_MAX
if (json_is_integer(json_value))
{
llvalue = (int64_t) json_integer_value (json_value);
}
// proto 3 spec states that integers may be entered as strings or numbers
else if (json_is_string(json_value))
{
errno = 0;
llvalue = strtoll (json_string_value (json_value), &endp, 10);;

if (errno == ERANGE || *endp != '\0')
{
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer required for GPB %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type)
"JSON string not successfully converted to value for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}
}
else
{
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer or string required for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}

if (!json2protobuf_integer_within_range (field_descriptor->type, llvalue))
{
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not within range for GPB %s %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type),
field_descriptor->name
);
}

uint32_t value_uint32_t = (uint32_t)json_integer_value(json_value);
if (field_descriptor->type == PROTOBUF_C_TYPE_INT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SFIXED32
) {
int32_t value_int32_t = (int32_t) llvalue;

memcpy(protobuf_value, &value_int32_t, sizeof(value_int32_t));
} else if (field_descriptor->type == PROTOBUF_C_TYPE_UINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_FIXED32
) {
uint32_t value_uint32_t = (uint32_t) llvalue;

memcpy(protobuf_value, &value_uint32_t, sizeof(value_uint32_t));
memcpy(protobuf_value, &value_uint32_t, sizeof(value_uint32_t));
} else if (field_descriptor->type == PROTOBUF_C_TYPE_INT64
|| field_descriptor->type == PROTOBUF_C_TYPE_SINT64
|| field_descriptor->type == PROTOBUF_C_TYPE_SFIXED64
) {
if (!json_is_integer(json_value)) {
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer required for GPB %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type)
);
}
int64_t value_int64_t = (int64_t) llvalue;

int64_t value_int64_t = (int64_t)json_integer_value(json_value);
memcpy(protobuf_value, &value_int64_t, sizeof(value_int64_t));
} else {
assert(0);
}

return 0;
}

memcpy(protobuf_value, &value_int64_t, sizeof(value_int64_t));
static int json2protobuf_process_field(
const ProtobufCFieldDescriptor *field_descriptor,
json_t *json_value,
void *protobuf_value,
char *error_string,
size_t error_size
) {
if (field_descriptor->type == PROTOBUF_C_TYPE_INT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_SFIXED32
|| field_descriptor->type == PROTOBUF_C_TYPE_UINT32
|| field_descriptor->type == PROTOBUF_C_TYPE_FIXED32
|| field_descriptor->type == PROTOBUF_C_TYPE_INT64
|| field_descriptor->type == PROTOBUF_C_TYPE_SINT64
|| field_descriptor->type == PROTOBUF_C_TYPE_SFIXED64
) {
int result = json2protobuf_process_integer_field (field_descriptor, json_value,
protobuf_value, error_string,
error_size);
if (result)
{
return result;
}
} else if (field_descriptor->type == PROTOBUF_C_TYPE_UINT64
|| field_descriptor->type == PROTOBUF_C_TYPE_FIXED64
) {
if (!json_is_integer(json_value)) {
SET_ERROR_STRING_AND_RETURN(
PROTOBUF2JSON_ERR_IS_NOT_INTEGER,
"JSON value is not an integer required for GPB %s",
json2protobuf_integer_name_by_c_type(field_descriptor->type)
);
int result = json2protobuf_process_uint64_field (field_descriptor, json_value,
protobuf_value, error_string,
error_size);
if (result)
{
return result;
}

uint64_t value_uint64_t = (uint64_t)json_integer_value(json_value);

memcpy(protobuf_value, &value_uint64_t, sizeof(value_uint64_t));
} else if (field_descriptor->type == PROTOBUF_C_TYPE_FLOAT) {
float value_float;

Expand Down
Loading