>From ef2f4122b44abbc4cae7876bb8566ed95151cdf5 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Sun, 3 Apr 2011 13:06:55 +0300 Subject: [PATCH 1/2] NULL pointer check to cReadline.read in tools.c Signed-off-by: Mika Laitio --- tools.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools.c b/tools.c index d03595e..c09a9b0 100644 --- a/tools.c +++ b/tools.c @@ -1191,18 +1191,20 @@ cReadLine::~cReadLine() char *cReadLine::Read(FILE *f) { - int n = getline(&buffer, &size, f); - if (n > 0) { - n--; - if (buffer[n] == '\n') { - buffer[n] = 0; - if (n > 0) { - n--; - if (buffer[n] == '\r') - buffer[n] = 0; + if (f != NULL) { + int n = getline(&buffer, &size, f); + if (n > 0) { + n--; + if (buffer[n] == '\n') { + buffer[n] = 0; + if (n > 0) { + n--; + if (buffer[n] == '\r') + buffer[n] = 0; + } } + return buffer; } - return buffer; } return NULL; } -- 1.7.3.4