Don't dereference NULL upon slashless module dependency line.
PATCH 1/1 Don't dereference NULL upon slashless module dependency line.
* probe.c (check_for_modules): Skip current line if it has no slash.
---
I found this by inspection while looking for the cause of a recent rawhide/nash segfault.
lib/blkid/probe.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
lib/blkid/probe.c +3 -2
@@ -225,8 +225,9 @@ static int check_for_modules(const char *fs_name) *cp =0 ; else continue; -if ((cp =strrchr (buf,'/' )) !=NULL ) - cp++; +if ((cp =strrchr (buf,'/' )) ==NULL ) +continue ; + cp++; i =strlen (cp);if (i >3 ) { t = cp + i -3 ;
--
1.6.2.rc1.256.g58a87
Quoted 17 lines · Jim Meyering
*
probe.c(check_for_modules): Skip current line if it has no slash.Signed-off-by Jim Meyering <[email protected]>---
I found this by inspection while looking for the cause of a recent rawhide/nash segfault.lib/blkid/probe.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)lib/blkid/probe.c +0
-0@@ -225,8 +225,9 @@ static int check_for_modules(const char *fs_name) *cp =0 ; else
lib/blkid/probe.c static int check_for_modules(const char *fs_name)
Quoted 10 lines
lib/blkid/probe.c +3
-3continue ; -if ((cp =strrchr (buf,'/' )) !=NULL ) - cp++; +if ((cp =strrchr (buf,'/' )) ==NULL ) +continue ; + cp++; i =strlen (cp);if (i >3 ) { t = cp + i -3 ; --
oops, I missed that Jim sent this (or just didn't remember w/ my goldfish brain)
OTOH the other patch I sent is probably a bit better, it gets both pieces of duplicated(!) code, and doeesn't skip these lines in modules.dep, it just skips the pre-"/"-stripping ...
-Eric
Quoted 2 lines · Jim Meyering
*
probe.c(check_for_modules): Skip current line if it has no slash.
Thanks for pointing this out; I've used Eric's patch to fix this issue.
- Ted