shithub: choc

Info  •  Files  •  Log  •  Branches

Fix unsigned integer overflow with calls to M_StrCaseStr where
strlen(haystack) < strlen(needle)

Subversion-branch: /branches/raven-branch
Subversion-revision: 1906

--- a/src/m_misc.c

+++ b/src/m_misc.c

@@ -263,12 +263,20 @@

 char *M_StrCaseStr(char *haystack, char *needle)

 {

+    unsigned int haystack_len;

     unsigned int needle_len;

     unsigned int len;

     unsigned int i;

+    haystack_len = strlen(haystack);

     needle_len = strlen(needle);

-    len = strlen(haystack) - needle_len;

+

+    if (haystack_len < needle_len)

+    {

+        return NULL;

+    }

+

+    len = haystack_len - needle_len;

     for (i = 0; i <= len; ++i)

     {