Add belt and braces check of PyString_AsString return.

andrewmcnamara · andrewmcnamara · commit 99f09622018d · 2005-01-12T01:16:35.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@38275 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -1098,17 +1098,18 @@ static int
 join_append_lineterminator(WriterObj *self)
 {
 	int terminator_len;
+	char *terminator;
 
 	terminator_len = PyString_Size(self->dialect->lineterminator);
 
 	/* grow record buffer if necessary */
 	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;
