aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1445

Browse Source 
Problem:    Memory corruption when 'encoding' is not utf-8.
Solution:   Convert decoded string later.
This commit is contained in:
Bram Moolenaar
2016-02-28 14:56:39 +01:00
parent 0f526f5652
commit b362872837
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/json.c
View File

@@ -86,6 +86,8 @@ write_string(garray_T *gap, char_u *str)
if (!enc_utf8) if (!enc_utf8)
{ {
/* Convert the text from 'encoding' to utf-8, the JSON string is
* always utf-8. */
conv.vc_type = CONV_NONE; conv.vc_type = CONV_NONE;
convert_setup(&conv, p_enc, (char_u*)"utf-8"); convert_setup(&conv, p_enc, (char_u*)"utf-8");
if (conv.vc_type != CONV_NONE) if (conv.vc_type != CONV_NONE)
@@ -534,33 +536,23 @@ json_decode_string(js_read_T *reader, typval_T *res)
int c; int c;
long nr; long nr;
char_u buf[NUMBUFLEN]; char_u buf[NUMBUFLEN];
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
vimconv_T conv;
char_u *converted = NULL;
#endif
if (res != NULL) if (res != NULL)
ga_init2(&ga, 1, 200); ga_init2(&ga, 1, 200);
p = reader->js_buf + reader->js_used + 1; /* skip over " */ p = reader->js_buf + reader->js_used + 1; /* skip over " */
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
if (!enc_utf8)
{
conv.vc_type = CONV_NONE;
convert_setup(&conv, (char_u*)"utf-8", p_enc);
if (conv.vc_type != CONV_NONE)
converted = p = string_convert(&conv, p, NULL);
convert_setup(&conv, NULL, NULL);
}
#endif
while (*p != '"') while (*p != '"')
{ {
/* The JSON is always expected to be utf-8, thus use utf functions
* here. The string is converted below if needed. */
if (*p == NUL || p[1] == NUL if (*p == NUL || p[1] == NUL
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
|| utf_ptr2len(p) < utf_byte2len(*p) || utf_ptr2len(p) < utf_byte2len(*p)
#endif #endif
) )
{ {
/* Not enough bytes to make a character or end of the string. Get
* more if possible. */
if (reader->js_fill == NULL) if (reader->js_fill == NULL)
break; break;
len = (int)(reader->js_end - p); len = (int)(reader->js_end - p);
@@ -652,9 +644,6 @@ json_decode_string(js_read_T *reader, typval_T *res)
if (ga_grow(&ga, len) == FAIL) if (ga_grow(&ga, len) == FAIL)
{ {
ga_clear(&ga); ga_clear(&ga);
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
vim_free(converted);
#endif
return FAIL; return FAIL;
} }
mch_memmove((char *)ga.ga_data + ga.ga_len, p, (size_t)len); mch_memmove((char *)ga.ga_data + ga.ga_len, p, (size_t)len);
@@ -663,9 +652,6 @@ json_decode_string(js_read_T *reader, typval_T *res)
p += len; p += len;
} }
} }
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
vim_free(converted);
#endif
reader->js_used = (int)(p - reader->js_buf); reader->js_used = (int)(p - reader->js_buf);
if (*p == '"') if (*p == '"')
@@ -674,7 +660,25 @@ json_decode_string(js_read_T *reader, typval_T *res)
if (res != NULL) if (res != NULL)
{ {
res->v_type = VAR_STRING; res->v_type = VAR_STRING;
res->vval.v_string = ga.ga_data; #if defined(FEAT_MBYTE) && defined(USE_ICONV)
if (!enc_utf8)
{
vimconv_T conv;
/* Convert the utf-8 string to 'encoding'. */
conv.vc_type = CONV_NONE;
convert_setup(&conv, (char_u*)"utf-8", p_enc);
if (conv.vc_type != CONV_NONE)
{
res->vval.v_string =
string_convert(&conv, ga.ga_data, NULL);
vim_free(ga.ga_data);
}
convert_setup(&conv, NULL, NULL);
}
else
#endif
res->vval.v_string = ga.ga_data;
} }
return OK; return OK;
} }

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1445,
/**/ /**/
1444, 1444,
/**/ /**/