From 7f7e6e59f48bbd754847c825075a9c46962e0116 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 19 Jul 2007 14:50:05 +0200 Subject: [PATCH] Fix memory overflow bugs Signed-off-by: Jens Axboe --- init.c | 8 ++++++-- parse.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/init.c b/init.c index f0aa5e3b..93322fdc 100644 --- a/init.c +++ b/init.c @@ -564,8 +564,12 @@ static int parse_jobs_ini(char *file, int stonewall_flag) } string = malloc(4096); - name = malloc(256); - memset(name, 0, 256); + + /* + * it's really 256 + small bit, 280 should suffice + */ + name = malloc(280); + memset(name, 0, 280); stonewall = stonewall_flag; do { diff --git a/parse.c b/parse.c index 9015b1d7..f0e644f1 100644 --- a/parse.c +++ b/parse.c @@ -159,8 +159,8 @@ void strip_blank_end(char *p) if (s) p = s; - s = p + strlen(p) - 1; - while (isspace(*s) || iscntrl(*s)) + s = p + strlen(p); + while ((isspace(*s) || iscntrl(*s)) && (s > p)) s--; *(s + 1) = '\0'; -- 2.25.1