@@ -881,14 +881,15 @@ mbfl_strpos(
881
881
goto out ;
882
882
}
883
883
884
+
885
+ size_t jtbl [1 << (sizeof (unsigned char ) * 8 )];
886
+ size_t needle_u8_len = needle_u8 -> len ;
887
+ size_t i ;
888
+ const unsigned char * p , * q , * e ;
889
+ const unsigned char * haystack_u8_val = haystack_u8 -> val ,
890
+ * needle_u8_val = needle_u8 -> val ;
884
891
/* Bug somewhere in this segment for Out Of Bound detection (normal mode i.e. !reverse with negative offsets) */
885
892
if (!reverse ) {
886
- size_t jtbl [1 << (sizeof (unsigned char ) * 8 )];
887
- size_t needle_u8_len = needle_u8 -> len ;
888
- size_t i ;
889
- const unsigned char * p , * q , * e ;
890
- const unsigned char * haystack_u8_val = haystack_u8 -> val ,
891
- * needle_u8_val = needle_u8 -> val ;
892
893
for (i = 0 ; i < sizeof (jtbl ) / sizeof (* jtbl ); ++ i ) {
893
894
jtbl [i ] = needle_u8_len + 1 ;
894
895
}
@@ -935,12 +936,8 @@ mbfl_strpos(
935
936
}
936
937
}
937
938
} else {
938
- size_t jtbl [1 << (sizeof (unsigned char ) * 8 )];
939
- size_t needle_u8_len = needle_u8 -> len , needle_len = 0 ;
940
- size_t i ;
941
- const unsigned char * p , * e , * q , * qe ;
942
- const unsigned char * haystack_u8_val = haystack_u8 -> val ,
943
- * needle_u8_val = needle_u8 -> val ;
939
+ size_t needle_len = 0 ;
940
+ const unsigned char * qe ;
944
941
for (i = 0 ; i < sizeof (jtbl ) / sizeof (* jtbl ); ++ i ) {
945
942
jtbl [i ] = needle_u8_len ;
946
943
}
0 commit comments