Do not check symbol returned (or not and so there is some garbadge) by mb_wc() if mb_wc() failed

nayuta-yanagisawa · sanja-byelkin · commit faddcf3c395d · 2022-08-10T11:20:58.000+02:00
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
@@ -70,7 +70,7 @@ ulonglong find_set(TYPELIB *lib, const char *str, size_t length, CHARSET_INFO *c
           if ((mblen= cs->cset->mb_wc(cs, &wc, (const uchar *) pos, 
                                                (const uchar *) end)) < 1)
             mblen= 1; // Not to hang on a wrong multibyte sequence
-          if (wc == (my_wc_t) field_separator)
+          else if (wc == (my_wc_t) field_separator)
             break;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ ulonglong find_set(TYPELIB lib, const char str, size_t length, CHARSET_INFO *c`
`70`	`70`	`if ((mblen= cs->cset->mb_wc(cs, &wc, (const uchar *) pos,`
`71`	`71`	`(const uchar *) end)) < 1)`
`72`	`72`	`mblen= 1; // Not to hang on a wrong multibyte sequence`
`73`		`- if (wc == (my_wc_t) field_separator)`
	`73`	`+ else if (wc == (my_wc_t) field_separator)`
`74`	`74`	`break;`
`75`	`75`	`}`
`76`	`76`	`}`