Skip to content

Commit 0a11d6c

Browse files
author
kalibera
committed
Increase buffer size to avoid the (theoretical) possibility of truncation,
and a warning. git-svn-id: https://svn.r-project.org/R/trunk@85676 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent a811921 commit 0a11d6c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/character.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ static void substr(const char *str, int len, int ienc, int sa, int so,
383383

384384
if (ienc == CE_UTF8) {
385385
if (!assumevalid && !utf8Valid(str)) {
386-
char msg[30];
387-
snprintf(msg, 30, "element %ld", (long)idx+1);
386+
char msg[40];
387+
snprintf(msg, 40, "element %ld", (long)idx+1);
388388
error(_("invalid multibyte string, %s"), msg);
389389
}
390390
for (i = 0; i < sa - 1 && str < end; i++)
@@ -588,13 +588,13 @@ substrset(char *buf, const char *const str, cetype_t ienc, int sa, int so,
588588

589589
if (ienc == CE_UTF8) {
590590
if (!utf8Valid(buf)) {
591-
char msg[30];
592-
snprintf(msg, 30, "element %ld", (long)xidx+1);
591+
char msg[40];
592+
snprintf(msg, 40, "element %ld", (long)xidx+1);
593593
error(_("invalid multibyte string, %s"), msg);
594594
}
595595
if (!utf8Valid(str)) {
596-
char msg[30];
597-
snprintf(msg, 30, "value element %ld", (long)vidx+1);
596+
char msg[40];
597+
snprintf(msg, 40, "value element %ld", (long)vidx+1);
598598
error(_("invalid multibyte string, %s"), msg);
599599
}
600600
for (i = 1; i < sa; i++) buf += utf8clen(*buf);

0 commit comments

Comments
 (0)