drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strchrnul: avoid segv 

* libc/string/strchrnul.c (strchrnul): Fix strchrnul.
This commit is contained in:
Eric Blake 2011-04-15 20:26:05 +00:00
parent 6f714140b5
commit 0fbf39cc9f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-15 Eric Blake <eblake@redhat.com>
* libc/string/strchrnul.c (strchrnul): Fix strchrnul.
2011-03-27 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* libc/include/string.h (strchrnul): Declare.

4
newlib/libc/string/strchrnul.c
View File

@ -43,7 +43,5 @@ _DEFUN (strchrnul, (s1, i),
{
char *s = strchr(s1, i);
if (*s != NULL)
return s;
return (char *)s1 + strlen(s1);
return s ? s : (char *)s1 + strlen(s1);
}