jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

stristr() and stristr_full() didn't work correctly with empty needle

Browse Source 
argument.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@898 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-11-30 01:14:49 +00:00 committed by cras
parent 1d48bc59ac
commit cbf45ea6bf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/misc.c
View File

@ -307,8 +307,10 @@ char *stristr(const char *data, const char *key)
keylen = strlen(key); keylen = strlen(key);
datalen = strlen(data); datalen = strlen(data);
if (keylen > datalen || keylen == 0) if (keylen > datalen)
return NULL; return NULL;
if (keylen == 0)
return (char *) data;
max = data+datalen-keylen; max = data+datalen-keylen;
pos = 0; pos = 0;
@ -339,8 +341,10 @@ char *stristr_full(const char *data, const char *key)
keylen = strlen(key); keylen = strlen(key);
datalen = strlen(data); datalen = strlen(data);
if (keylen > datalen || keylen == 0) if (keylen > datalen)
return NULL; return NULL;
if (keylen == 0)
return (char *) data;
max = data+datalen-keylen; max = data+datalen-keylen;
start = data; pos = 0; start = data; pos = 0;