@@ -127,11 +127,12 @@ memchr2(const char *haystack, size_t haystack_len, char c0, char c1)
127127static const char *
128128my_memmem (const char * haystack ,size_t hlen ,const char * needle ,size_t nlen )
129129{
130+ const char * cur ;
131+ const char * last ;
130132assert (haystack );
131133assert (needle );
132134assert (nlen > 1 );
133- const char * cur ;
134- const char * last = haystack + hlen - nlen ;
135+ last = haystack + hlen - nlen ;
135136for (cur = haystack ;cur <=last ;++ cur ) {
136137if (cur [0 ]== needle [0 ]&& memcmp (cur ,needle ,nlen )== 0 ) {
137138return cur ;
@@ -485,6 +486,7 @@ static size_t is_mysql_comment(const char *cs, const size_t len, size_t pos)
485486
486487static size_t parse_slash (struct libinjection_sqli_state * sf )
487488{
489+ const char * ptr ;
488490size_t clen ;
489491const char * cs = sf -> s ;
490492const size_t slen = sf -> slen ;
@@ -499,7 +501,7 @@ static size_t parse_slash(struct libinjection_sqli_state * sf)
499501/*
500502 * skip over initial '/x'
501503 */
502- const char * ptr = memchr2 (cur + 2 ,slen - (pos + 2 ),'*' ,'/' );
504+ ptr = memchr2 (cur + 2 ,slen - (pos + 2 ),'*' ,'/' );
503505
504506/*
505507 * (ptr == NULL) causes false positive in cppcheck 1.61
@@ -1286,8 +1288,8 @@ void libinjection_sqli_init(struct libinjection_sqli_state * sf, const char *s,
12861288
12871289void libinjection_sqli_reset (struct libinjection_sqli_state * sf ,int flags )
12881290{
1289- ptr_lookup_fn lookup = sf -> lookup ;;
12901291void * userdata = sf -> userdata ;
1292+ ptr_lookup_fn lookup = sf -> lookup ;;
12911293
12921294if (flags == 0 ) {
12931295flags = FLAG_QUOTE_NONE |FLAG_SQL_ANSI ;
@@ -1936,6 +1938,7 @@ int libinjection_sqli_blacklist(struct libinjection_sqli_state* sql_state)
19361938char ch ;
19371939size_t i ;
19381940size_t len = strlen (sql_state -> fingerprint );
1941+ int patmatch ;
19391942
19401943if (len < 1 ) {
19411944sql_state -> reason = __LINE__ ;
@@ -1959,7 +1962,7 @@ int libinjection_sqli_blacklist(struct libinjection_sqli_state* sql_state)
19591962 }
19601963fp2 [i + 1 ]= '\0' ;
19611964
1962- int patmatch = is_keyword (fp2 ,len + 1 )== TYPE_FINGERPRINT ;
1965+ patmatch = is_keyword (fp2 ,len + 1 )== TYPE_FINGERPRINT ;
19631966
19641967/*
19651968 * No match.
