pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-31 23:20:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix issue with read builtin delimiter in invaild mutibyte char; fix crash if caller passes negative count argument to one of the history file writing functions

Browse Source
This commit is contained in:
Chet Ramey
2024-08-09 10:01:38 -04:00
parent e45ec6f76b
commit 772e7e760e
19 changed files with 3135 additions and 2976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtins/read.def
+18 -5
View File
@@ -130,7 +130,7 @@ static void uw_bashline_reset_event_hook (void *);
#endif
static SHELL_VAR *bind_read_variable (char *, char *, int);
#if defined (HANDLE_MULTIBYTE)
static int read_mbchar (int, char *, int, int, int);
static int read_mbchar (int, char *, int, int, int, int);
#endif
static void ttyrestore (struct ttsave *);
static void uw_ttyrestore (void *);
@@ -867,7 +867,7 @@ add_char:
else
# endif
if (locale_utf8locale == 0 || ((c & 0x80) != 0))
i += read_mbchar (fd, input_string, i, c, unbuffered_read);
i += read_mbchar (fd, input_string, i, c, delim, unbuffered_read);
}
#endif
@@ -1149,7 +1149,7 @@ bind_read_variable (char *name, char *value, int flags)
#if defined (HANDLE_MULTIBYTE)
static int
read_mbchar (int fd, char *string, int ind, int ch, int unbuffered)
read_mbchar (int fd, char *string, int ind, int ch, int delim, int unbuffered)
{
char mbchar[MB_LEN_MAX + 1];
int i, n, r;
@@ -1183,8 +1183,21 @@ read_mbchar (int fd, char *string, int ind, int ch, int unbuffered)
mbchar[i++] = c;
continue;
}
else if (ret == (size_t)-1 || ret == (size_t)0 || ret > (size_t)0)
break;
else if (ret == (size_t)-1)
{
/* If we read a delimiter character that makes this an invalid
multibyte character, we can't just add it to the input string
and treat it as a byte. We need to push it back so a subsequent
zread will pick it up. */
if (c == delim)
{
zungetc (c);
mbchar[--i] = '\0'; /* unget the delimiter */
}
break; /* invalid multibyte character */
}
else if (ret == (size_t)0 || ret > (size_t)0)
break; /* valid multibyte character */
}
mbchar_return: