From cf0fd5ab2944eac38c2cd9c0904b24fd8e30e32f Mon Sep 17 00:00:00 2001 From: Andrew McNamara Date: Wed, 12 Jan 2005 01:16:35 +0000 Subject: [PATCH] Add belt and braces check of PyString_AsString return. --- Modules/_csv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/_csv.c b/Modules/_csv.c index 03e715a41b..a433960132 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -1098,6 +1098,7 @@ static int join_append_lineterminator(WriterObj *self) { int terminator_len; + char *terminator; terminator_len = PyString_Size(self->dialect->lineterminator); @@ -1105,10 +1106,10 @@ join_append_lineterminator(WriterObj *self) if (!join_check_rec_size(self, self->rec_len + terminator_len)) return 0; - memmove(self->rec + self->rec_len, - /* should not be NULL */ - PyString_AsString(self->dialect->lineterminator), - terminator_len); + terminator = PyString_AsString(self->dialect->lineterminator); + if (terminator == NULL) + return 0; + memmove(self->rec + self->rec_len, terminator, terminator_len); self->rec_len += terminator_len; return 1; -- 2.50.0