Fix memory leaks in ProcessObject.

ericpeden · ericpeden · commit a652ad05f7c5 · 2014-05-29T20:14:25.000-07:00
diff --git a/encoder.c b/encoder.c
@@ -142,7 +142,9 @@ static yajl_gen_status ProcessObject(_YajlEncoder *self, PyObject *object)
             }
         }
         buffer[offset] = '\0';
-        return yajl_gen_raw_string(handle, (const unsigned char *)(buffer), (unsigned int)(offset));
+        status = yajl_gen_raw_string(handle, (const unsigned char *)(buffer), (unsigned int)(offset));
+        free(buffer);
+        return status;
     }
 #ifdef IS_PYTHON3
     if (PyBytes_Check(object)) {
@@ -238,6 +240,9 @@ static yajl_gen_status ProcessObject(_YajlEncoder *self, PyObject *object)
             }
 
             status = ProcessObject(self, newKey);
+            if (key != newKey) {
+                Py_XDECREF(newKey);
+            }
             if (status == yajl_gen_in_error_state) return status;
             if (status == yajl_max_depth_exceeded) goto exit;
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,9 @@ static yajl_gen_status ProcessObject(_YajlEncoder self, PyObject object)`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`buffer[offset] = '\0';`
`145`		`- return yajl_gen_raw_string(handle, (const unsigned char *)(buffer), (unsigned int)(offset));`
	`145`	`+ status = yajl_gen_raw_string(handle, (const unsigned char *)(buffer), (unsigned int)(offset));`
	`146`	`+ free(buffer);`
	`147`	`+ return status;`
`146`	`148`	`}`
`147`	`149`	`#ifdef IS_PYTHON3`
`148`	`150`	`if (PyBytes_Check(object)) {`
`@@ -238,6 +240,9 @@ static yajl_gen_status ProcessObject(_YajlEncoder self, PyObject object)`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`status = ProcessObject(self, newKey);`
	`243`	`+ if (key != newKey) {`
	`244`	`+ Py_XDECREF(newKey);`
	`245`	`+ }`
`241`	`246`	`if (status == yajl_gen_in_error_state) return status;`
`242`	`247`	`if (status == yajl_max_depth_exceeded) goto exit;`
`243`	`248`