aboutsummaryrefslogtreecommitdiff
path: root/libbb/last_char_is.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-07-07 04:27:35 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-07-07 04:27:35 +0000
commitc1928d6db345520c868993bda5f0f6f2d2a0f6a9 (patch)
treea7cb84309210befe3449d6bae4b4944181c27940 /libbb/last_char_is.c
parent1dbacca8a7fce660271244975dab69812288a76f (diff)
downloadbusybox-w32-c1928d6db345520c868993bda5f0f6f2d2a0f6a9.tar.gz
busybox-w32-c1928d6db345520c868993bda5f0f6f2d2a0f6a9.tar.bz2
busybox-w32-c1928d6db345520c868993bda5f0f6f2d2a0f6a9.zip
Avoid a segfault (detected by Fabio Ferrari
<fabio.ferrari@digitro.com.br> in the wget applet) when concat_path_file() or last_char_is() were fed a NULL. -Erik git-svn-id: svn://busybox.net/trunk/busybox@3027 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r--libbb/last_char_is.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index a95e57c35..4e2ee92ed 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -28,7 +28,10 @@
28 */ 28 */
29char * last_char_is(const char *s, int c) 29char * last_char_is(const char *s, int c)
30{ 30{
31 char *sret = (char *)s+strlen(s)-1; 31 char *sret;
32 if (!s)
33 return NULL;
34 sret = (char *)s+strlen(s)-1;
32 if (sret>=s && *sret == c) { 35 if (sret>=s && *sret == c) {
33 return sret; 36 return sret;
34 } else { 37 } else {