svn commit: trunk/busybox/scripts/basic
vapier at busybox.net
vapier at busybox.net
Sat Dec 30 19:21:48 UTC 2006
Author: vapier
Date: 2006-12-30 11:21:48 -0800 (Sat, 30 Dec 2006)
New Revision: 17107
Log:
prevent accessing memory that we dont own
Modified:
trunk/busybox/scripts/basic/fixdep.c
Changeset:
Modified: trunk/busybox/scripts/basic/fixdep.c
===================================================================
--- trunk/busybox/scripts/basic/fixdep.c 2006-12-30 18:42:29 UTC (rev 17106)
+++ trunk/busybox/scripts/basic/fixdep.c 2006-12-30 19:21:48 UTC (rev 17107)
@@ -231,10 +231,10 @@
int off;
for (; p < end; p++) {
- if (!memcmp(p, "CONFIG_", 7)) goto conf7;
- if (!memcmp(p, "ENABLE_", 7)) goto conf7;
- if (!memcmp(p, "USE_", 4)) goto conf4;
- if (!memcmp(p, "SKIP_", 5)) goto conf5;
+ if (p<end-7 && !memcmp(p, "CONFIG_", 7)) goto conf7;
+ if (p<end-7 && !memcmp(p, "ENABLE_", 7)) goto conf7;
+ if (p<end-4 && !memcmp(p, "USE_", 4)) goto conf4;
+ if (p<end-5 && !memcmp(p, "SKIP_", 5)) goto conf5;
continue;
conf4: off = 4; goto conf;
conf5: off = 5; goto conf;
@@ -303,7 +303,7 @@
char *p;
char s[PATH_MAX];
- p = strchr(m, ':');
+ p = memchr(m, ':', len);
if (!p) {
fprintf(stderr, "fixdep: parse error\n");
exit(1);
More information about the busybox-cvs
mailing list