fix compiler warnings

benjaminp · benjaminp · commit 17a332ac1b62 · 2011-10-06T17:06:25.000-04:00
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -529,13 +529,13 @@ parse_grow_buff(ReaderObj *self)
         self->field = PyMem_New(Py_UNICODE, self->field_size);
     }
     else {
+        Py_UNICODE *field = self->field;
         if (self->field_size > PY_SSIZE_T_MAX / 2) {
             PyErr_NoMemory();
             return 0;
         }
         self->field_size *= 2;
-        self->field = PyMem_Resize(self->field, Py_UNICODE,
-                                   self->field_size);
+        self->field = PyMem_Resize(field, Py_UNICODE, self->field_size);
     }
     if (self->field == NULL) {
         PyErr_NoMemory();
@@ -1055,8 +1055,7 @@ join_check_rec_size(WriterObj *self, Py_ssize_t rec_len)
             Py_UNICODE* old_rec = self->rec;
 
             self->rec_size = (rec_len / MEM_INCR + 1) * MEM_INCR;
-            self->rec = PyMem_Resize(self->rec, Py_UNICODE,
-                         self->rec_size);
+            self->rec = PyMem_Resize(old_rec, Py_UNICODE, self->rec_size);
             if (self->rec == NULL)
                 PyMem_Free(old_rec);
         }

Original file line number	Diff line number	Diff line change
`@@ -529,13 +529,13 @@ parse_grow_buff(ReaderObj *self)`
`529`	`529`	`self->field = PyMem_New(Py_UNICODE, self->field_size);`
`530`	`530`	`}`
`531`	`531`	`else {`
	`532`	`+ Py_UNICODE *field = self->field;`
`532`	`533`	`if (self->field_size > PY_SSIZE_T_MAX / 2) {`
`533`	`534`	`PyErr_NoMemory();`
`534`	`535`	`return 0;`
`535`	`536`	`}`
`536`	`537`	`self->field_size *= 2;`
`537`		`- self->field = PyMem_Resize(self->field, Py_UNICODE,`
`538`		`- self->field_size);`
	`538`	`+ self->field = PyMem_Resize(field, Py_UNICODE, self->field_size);`
`539`	`539`	`}`
`540`	`540`	`if (self->field == NULL) {`
`541`	`541`	`PyErr_NoMemory();`
`@@ -1055,8 +1055,7 @@ join_check_rec_size(WriterObj *self, Py_ssize_t rec_len)`
`1055`	`1055`	`Py_UNICODE* old_rec = self->rec;`
`1056`	`1056`
`1057`	`1057`	`self->rec_size = (rec_len / MEM_INCR + 1) * MEM_INCR;`
`1058`		`- self->rec = PyMem_Resize(self->rec, Py_UNICODE,`
`1059`		`- self->rec_size);`
	`1058`	`+ self->rec = PyMem_Resize(old_rec, Py_UNICODE, self->rec_size);`
`1060`	`1059`	`if (self->rec == NULL)`
`1061`	`1060`	`PyMem_Free(old_rec);`
`1062`	`1061`	`}`