Merge pull request #720 from zhou3968322/master

JorjMcKie · web-flow · commit a1de5bdc8e63 · 2020-11-11T07:36:03.000-04:00
fix getMetadata memory leak
diff --git a/fitz/fitz.i b/fitz/fitz.i
@@ -1101,19 +1101,20 @@ struct Document
         }
 
         CLOSECHECK0(_getMetadata, """Get metadata.""")
-        char *_getMetadata(const char *key)
+        PyObject* _getMetadata(const char *key)
         {
+            PyObject *res;
             fz_document *doc = (fz_document *) $self;
             int vsize;
             char *value;
             vsize = fz_lookup_metadata(gctx, doc, key, NULL, 0)+1;
             if(vsize > 1) {
                 value = JM_Alloc(char, vsize);
                 fz_lookup_metadata(gctx, doc, key, value, vsize);
-                return value;
+                res = PyString_FromString(value);
+                PyMem_Del(value);
             }
-            else
-                return NULL;
+            return res;
         }
 
         CLOSECHECK0(needsPass, """Indicate password required.""")

Original file line number	Diff line number	Diff line change
`@@ -1101,19 +1101,20 @@ struct Document`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`CLOSECHECK0(_getMetadata, """Get metadata.""")`
`1104`		`- char _getMetadata(const char key)`
	`1104`	`+ PyObject* _getMetadata(const char *key)`
`1105`	`1105`	`{`
	`1106`	`+ PyObject *res;`
`1106`	`1107`	`fz_document doc = (fz_document ) $self;`
`1107`	`1108`	`int vsize;`
`1108`	`1109`	`char *value;`
`1109`	`1110`	`vsize = fz_lookup_metadata(gctx, doc, key, NULL, 0)+1;`
`1110`	`1111`	`if(vsize > 1) {`
`1111`	`1112`	`value = JM_Alloc(char, vsize);`
`1112`	`1113`	`fz_lookup_metadata(gctx, doc, key, value, vsize);`
`1113`		`- return value;`
	`1114`	`+ res = PyString_FromString(value);`
	`1115`	`+ PyMem_Del(value);`
`1114`	`1116`	`}`
`1115`		`- else`
`1116`		`- return NULL;`
	`1117`	`+ return res;`
`1117`	`1118`	`}`
`1118`	`1119`
`1119`	`1120`	`CLOSECHECK0(needsPass, """Indicate password required.""")`