1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: term fill

Browse Source 
* string.c (str_buf_cat): fill wchar terminator.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-26 03:43:20 +00:00
parent c0d0dd91e5
commit 44bf6684fd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
string.c
View File

@ -98,6 +98,9 @@ VALUE rb_cSymbol;
#define RESIZE_CAPA(str,capacity) do {\ #define RESIZE_CAPA(str,capacity) do {\
const int termlen = TERM_LEN(str);\ const int termlen = TERM_LEN(str);\
RESIZE_CAPA_TERM(str,capacity,termlen);\
} while (0)
#define RESIZE_CAPA_TERM(str,capacity,termlen) do {\
if (STR_EMBED_P(str)) {\ if (STR_EMBED_P(str)) {\
if ((capacity) > RSTRING_EMBED_LEN_MAX) {\ if ((capacity) > RSTRING_EMBED_LEN_MAX) {\
char *const tmp = ALLOC_N(char, (capacity)+termlen);\ char *const tmp = ALLOC_N(char, (capacity)+termlen);\
@ -2169,6 +2172,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
{ {
long capa, total, olen, off = -1; long capa, total, olen, off = -1;
char *sptr; char *sptr;
const int termlen = TERM_LEN(str);
RSTRING_GETMEM(str, sptr, olen); RSTRING_GETMEM(str, sptr, olen);
if (ptr >= sptr && ptr <= sptr + olen) { if (ptr >= sptr && ptr <= sptr + olen) {
@ -2198,7 +2202,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
} }
capa = 2 * capa; capa = 2 * capa;
} }
RESIZE_CAPA(str, capa); RESIZE_CAPA_TERM(str, capa, termlen);
sptr = RSTRING_PTR(str); sptr = RSTRING_PTR(str);
} }
if (off != -1) { if (off != -1) {
@ -2206,7 +2210,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
} }
memcpy(sptr + olen, ptr, len); memcpy(sptr + olen, ptr, len);
STR_SET_LEN(str, total); STR_SET_LEN(str, total);
RSTRING_PTR(str)[total] = '\0'; /* sentinel */ TERM_FILL(sptr + total, termlen); /* sentinel */
return str; return str;
} }