Skip to content

Commit

Permalink
Fix compatibility with ISO C89 needed by "gnu89" standard of GCC 4.8:…
Browse files Browse the repository at this point in the history
… use C89 for loops in backported pickle patch (#12622)
  • Loading branch information
asottile authored and larryhastings committed Jul 13, 2019
1 parent 221178a commit 43a0ae9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
@@ -0,0 +1 @@
Fix compatibility with ISO C89 needed by "gnu89" standard of GCC 4.8: use C89 for loops in backported pickle patch. Patch by Anthony Sottile.
11 changes: 7 additions & 4 deletions Modules/_pickle.c
Expand Up @@ -658,6 +658,7 @@ PyMemoTable_New(void)
static PyMemoTable *
PyMemoTable_Copy(PyMemoTable *self)
{
size_t i;
PyMemoTable *new = PyMemoTable_New();
if (new == NULL)
return NULL;
Expand All @@ -674,7 +675,7 @@ PyMemoTable_Copy(PyMemoTable *self)
PyErr_NoMemory();
return NULL;
}
for (size_t i = 0; i < self->mt_allocated; i++) {
for (i = 0; i < self->mt_allocated; i++) {
Py_XINCREF(self->mt_table[i].me_key);
}
memcpy(new->mt_table, self->mt_table,
Expand Down Expand Up @@ -4198,13 +4199,14 @@ static PyObject *
_pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self)
/*[clinic end generated code: output=bb83a919d29225ef input=b73043485ac30b36]*/
{
size_t i;
PyMemoTable *memo;
PyObject *new_memo = PyDict_New();
if (new_memo == NULL)
return NULL;

memo = self->pickler->memo;
for (size_t i = 0; i < memo->mt_allocated; ++i) {
for (i = 0; i < memo->mt_allocated; ++i) {
PyMemoEntry entry = memo->mt_table[i];
if (entry.me_key != NULL) {
int status;
Expand Down Expand Up @@ -6773,6 +6775,7 @@ Unpickler_get_memo(UnpicklerObject *self)
static int
Unpickler_set_memo(UnpicklerObject *self, PyObject *obj)
{
size_t i;
PyObject **new_memo;
size_t new_memo_size = 0;

Expand All @@ -6791,7 +6794,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj)
if (new_memo == NULL)
return -1;

for (size_t i = 0; i < new_memo_size; i++) {
for (i = 0; i < new_memo_size; i++) {
Py_XINCREF(unpickler->memo[i]);
new_memo[i] = unpickler->memo[i];
}
Expand Down Expand Up @@ -6839,7 +6842,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj)

error:
if (new_memo_size) {
for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
for (i = new_memo_size - 1; i != SIZE_MAX; i--) {
Py_XDECREF(new_memo[i]);
}
PyMem_FREE(new_memo);
Expand Down

0 comments on commit 43a0ae9

Please sign in to comment.