From a10cfa80dd3b9fc7ab3f6b4a10a9e7b5cf8f80aa Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 21 May 2005 00:31:30 +0000 Subject: [PATCH] Fix for crash in DohStrstr, bug #1190921 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7204 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/DOH/string.c b/Source/DOH/string.c index 1aede9e08..55882f83b 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1037,7 +1037,7 @@ int DohStrncmp(const DOHString_or_char *s1, const DOHString_or_char *s2, int n) char *DohStrstr(const DOHString_or_char *s1, const DOHString_or_char *s2) { char* p1 = Char(s1); char* p2 = Char(s2); - return p2 == 0 || *p2 == '\0' ? p1 : strstr(p1,p2); + return p1 == 0 || p2 == 0 || *p2 == '\0' ? p1 : strstr(p1,p2); } char *DohStrchr(const DOHString_or_char *s1, int ch) {