Fix reference leaks introduced by the patch for issue #5308.

diff --git a/Python/marshal.c b/Python/marshal.c
index 959f3f7f2cd50a028ddb31467faf188a91f879a7..23764ccb7e2748cb31258222692be73c93d54575 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -95,7 +95,7 @@ w_more(int c, WFILE *p)
 }
 
 static void
-w_string(char *s, Py_ssize_t n, WFILE *p)
+w_string(const char *s, Py_ssize_t n, WFILE *p)
 {
     if (p->fp != NULL) {
         fwrite(s, 1, n, p->fp);
@@ -139,6 +139,13 @@ w_long(long x, WFILE *p)
 # define W_SIZE  w_long
 #endif
 
+static void
+w_pstring(const char *s, Py_ssize_t n, WFILE *p)
+{
+        W_SIZE(n, p);
+        w_string(s, n, p);
+}
+
 /* We assume that Python longs are stored internally in base some power of
    2**15; for the sake of portability we'll always read and write them in base
    exactly 2**15. */
@@ -313,9 +320,7 @@ w_object(PyObject *v, WFILE *p)
     }
     else if (PyBytes_CheckExact(v)) {
         w_byte(TYPE_STRING, p);
-        n = PyBytes_GET_SIZE(v);
-        W_SIZE(n, p);
-        w_string(PyBytes_AS_STRING(v), n, p);
+        w_pstring(PyBytes_AS_STRING(v), PyBytes_GET_SIZE(v), p);
     }
     else if (PyUnicode_CheckExact(v)) {
         PyObject *utf8;
@@ -326,9 +331,7 @@ w_object(PyObject *v, WFILE *p)
             return;
         }
         w_byte(TYPE_UNICODE, p);
-        n = PyBytes_GET_SIZE(utf8);
-        W_SIZE(n, p);
-        w_string(PyBytes_AS_STRING(utf8), n, p);
+        w_pstring(PyBytes_AS_STRING(utf8), PyBytes_GET_SIZE(utf8), p);
         Py_DECREF(utf8);
     }
     else if (PyTuple_CheckExact(v)) {
@@ -411,7 +414,6 @@ w_object(PyObject *v, WFILE *p)
     }
     else if (PyObject_CheckBuffer(v)) {
         /* Write unknown buffer-style objects as a string */
-        char *s;
         Py_buffer view;
         if (PyObject_GetBuffer(v, &view, PyBUF_SIMPLE) != 0) {
             w_byte(TYPE_UNKNOWN, p);
@@ -420,10 +422,7 @@ w_object(PyObject *v, WFILE *p)
             return;
         }
         w_byte(TYPE_STRING, p);
-        n = view.len;
-        s = view.buf;
-        W_SIZE(n, p);
-        w_string(s, n, p);
+        w_pstring(view.buf, view.len, p);
         PyBuffer_Release(&view);
     }
     else {