From a21c24bf03e4b8921a8afbf895de04273773dfac Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Mon, 12 Nov 2001 16:58:07 +0000 Subject: [PATCH] Convert strdup call to xstrdup, and calloc calls to xcalloc (patch from Steve Merrifield). --- findutils/grep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/findutils/grep.c b/findutils/grep.c index faecb58bc..48329e135 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -155,7 +155,7 @@ static void grep_file(FILE *file) if(lines_before) { if(before_buf[curpos]) free(before_buf[curpos]); - before_buf[curpos] = strdup(line); + before_buf[curpos] = xstrdup(line); curpos = (curpos + 1) % lines_before; } } @@ -306,13 +306,13 @@ extern int grep_main(int argc, char **argv) lines_before = strtoul(optarg, &junk, 10); if(*junk != '\0') error_msg_and_die("invalid context length argument"); - before_buf = (char **)calloc(lines_before, sizeof(char *)); + before_buf = (char **)xcalloc(lines_before, sizeof(char *)); break; case 'C': lines_after = lines_before = strtoul(optarg, &junk, 10); if(*junk != '\0') error_msg_and_die("invalid context length argument"); - before_buf = (char **)calloc(lines_before, sizeof(char *)); + before_buf = (char **)xcalloc(lines_before, sizeof(char *)); break; #endif /* CONFIG_FEATURE_GREP_CONTEXT */ default: -- 2.25.1