From cc398f47467c5f7a879c9d2dd2b70d099e7deffb Mon Sep 17 00:00:00 2001 From: Emil Date: Tue, 10 Oct 2023 03:41:17 +0000 Subject: [PATCH] MAP_FAILED overwrite unexpected in usecase --- baked-nobloat.c | 14 +------------- baked.c | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/baked-nobloat.c b/baked-nobloat.c index da671c5..85af899 100644 --- a/baked-nobloat.c +++ b/baked-nobloat.c @@ -44,8 +44,6 @@ map(const char * fn, size_t * len) { *len = s.st_size; addr = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (addr == MAP_FAILED) - { addr = NULL; } } close(fd); } @@ -76,17 +74,7 @@ find_region(const char * fn, const char * start, const char * stop) if ((pb = find(start, addr, len, strlen(start)))) { pb += strlen(start); - pe = find(stop, pb, len - (pb - addr), strlen(stop)); - if (!pe) - { - pe = pb; - while (*pe && *pe != '\n') - { - if (pe[0] == '\\' && pe[1] == '\n') - { pe += 2; } - ++pe; - } - } + pe = find(stop, pb, len - (pb - addr), strlen(stop)); if (pe) { buf = strndup(pb, (pe - addr) - (pb - addr)); } } diff --git a/baked.c b/baked.c index d2f93bb..5f87522 100644 --- a/baked.c +++ b/baked.c @@ -62,8 +62,6 @@ map(const char * fn, size_t * len) { *len = s.st_size; addr = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (addr == MAP_FAILED) - { addr = NULL; } } close(fd); } -- 2.39.5