fix nullptr-with-nonzero-offset UB

vuvova · vuvova · commit d198be392bdb · 2025-11-03T19:56:46.000+01:00
diff --git a/strings/ctype-uca-scanner_next.inl b/strings/ctype-uca-scanner_next.inl
@@ -81,7 +81,7 @@ MY_FUNCTION_NAME(scanner_next)(my_uca_scanner *scanner,
     const uint16 *cweight;
 
 #if MY_UCA_ASCII_OPTIMIZE && !defined(SCANNER_NEXT_NCHARS)
-    if (scanner->sbeg + 1 < scanner->send)
+    if (scanner->send - scanner->sbeg > 1)
     {
       const MY_UCA_2BYTES_ITEM *ww;
       ww= my_uca_level_booster_2bytes_item_addr_const(param->level->booster,

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ MY_FUNCTION_NAME(scanner_next)(my_uca_scanner *scanner,`
`81`	`81`	`const uint16 *cweight;`
`82`	`82`
`83`	`83`	`#if MY_UCA_ASCII_OPTIMIZE && !defined(SCANNER_NEXT_NCHARS)`
`84`		`- if (scanner->sbeg + 1 < scanner->send)`
	`84`	`+ if (scanner->send - scanner->sbeg > 1)`
`85`	`85`	`{`
`86`	`86`	`const MY_UCA_2BYTES_ITEM *ww;`
`87`	`87`	`ww= my_uca_level_booster_2bytes_item_addr_const(param->level->booster,`