Project

General

Profile

Download (2.86 KB)

Bug #13853 » json-ruby22.patch

hsbt (Hiroshi SHIBATA), 08/31/2017 03:04 AM

View differences:

ext/json/generator/generator.c
char *result;
if (len <= 0) return NULL;
result = ALLOC_N(char, len);
memccpy(result, ptr, 0, len);
memcpy(result, ptr, len);
return result;
}
......
}
} else {
if (state->indent) ruby_xfree(state->indent);
state->indent = strdup(RSTRING_PTR(indent));
state->indent = fstrndup(RSTRING_PTR(indent), len);
state->indent_len = len;
}
return Qnil;
......
}
} else {
if (state->space) ruby_xfree(state->space);
state->space = strdup(RSTRING_PTR(space));
state->space = fstrndup(RSTRING_PTR(space), len);
state->space_len = len;
}
return Qnil;
......
}
} else {
if (state->space_before) ruby_xfree(state->space_before);
state->space_before = strdup(RSTRING_PTR(space_before));
state->space_before = fstrndup(RSTRING_PTR(space_before), len);
state->space_before_len = len;
}
return Qnil;
......
}
} else {
if (state->object_nl) ruby_xfree(state->object_nl);
state->object_nl = strdup(RSTRING_PTR(object_nl));
state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
state->object_nl_len = len;
}
return Qnil;
......
}
} else {
if (state->array_nl) ruby_xfree(state->array_nl);
state->array_nl = strdup(RSTRING_PTR(array_nl));
state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
state->array_nl_len = len;
}
return Qnil;
ext/json/generator/generator.h
#ifndef _GENERATOR_H_
#define _GENERATOR_H_
#include <string.h>
#include <math.h>
#include <ctype.h>
ext/json/lib/json/version.rb
module JSON
# JSON version
VERSION = '1.8.1'
VERSION = '1.8.1.1'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
(1-1/2)