From: Eric Andersen Date: Tue, 6 Apr 2004 12:06:03 +0000 (-0000) Subject: Michael Tokarev, mjt at tls dot msk dot ru writes: X-Git-Tag: 1_00_pre9~20 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7e496a71cfe54f192508427f9c8ea5be764952bd;p=oweals%2Fbusybox.git Michael Tokarev, mjt at tls dot msk dot ru writes: Fix parsing of all tag-value pairs (in modules.conf in particular). Without this fix, code chokes badly on lines where either value or both tag+value are missing, like bare alias line, or alias w/o the value like alias some-module (syntactically incorrect, but no need for coredumps either). --- diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 7078af220..df5d4bbd1 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -67,15 +67,17 @@ int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) buffer++; tag = value = buffer; while ( !isspace ( *value )) - value++; + if (!*value) return 0; + else value++; *value++ = 0; while ( isspace ( *value )) value++; + if (!*value) return 0; *ptag = tag; *pvalue = value; - return bb_strlen( tag ) && bb_strlen( value ); + return 1; } /* Jump through hoops to simulate how fgets() grabs just one line at a