commit bash-20201030 snapshot

lib/glob/glob.c

@@ -484,7 +484,7 @@ wdequote_pathname (pathname)
   /* Convert the wide character string into unibyte character set. */
   memset (&ps, '\0', sizeof(mbstate_t));
   n = wcsrtombs(pathname, (const wchar_t **)&wpathname, len, &ps);
-  if (n == (size_t)-1 || *wpathname != 0)	/* what? now you tell me? */
+  if (n == (size_t)-1 || (wpathname && *wpathname != 0))	/* what? now you tell me? */
     {
       wpathname = orig_wpathname;
       memset (&ps, '\0', sizeof(mbstate_t));

lib/readline/isearch.c

@@ -418,9 +418,11 @@ add_character:
     {
       /* If we have a multibyte character, see if it's bound to something that
 	 affects the search. */
-      if (cxt->mb[1])
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && cxt->mb[1])
 	f = rl_function_of_keyseq (cxt->mb, cxt->keymap, (int *)NULL);
       else
+#endif
 	{
 	  f = cxt->keymap[c].function;
 	  if (f == rl_do_lowercase_version)