fix: fix memory leak on xdo_get_desktop_viewport (#299)

orcNo · longqi · web-flow · commit 7141bfd54c2d · 2021-02-12T23:44:31.000-08:00
free value that xdo_get_window_property_by_atom return

Co-authored-by: longqi &lt;longqi@uniontech.com&gt;
diff --git a/xdo.c b/xdo.c
@@ -1800,18 +1800,21 @@ int xdo_get_desktop_viewport(const xdo_t *xdo, int *x_ret, int *y_ret) {
             "Got unexpected type returned from _NET_DESKTOP_VIEWPORT."
             " Expected CARDINAL, got %s\n",
             XGetAtomName(xdo->xdpy, type));
+    free(data);
     return XDO_ERROR;
   }
 
   if (nitems != 2) {
     fprintf(stderr, "Expected 2 items for _NET_DESKTOP_VIEWPORT, got %ld\n",
             nitems);
+    free(data);
     return XDO_ERROR;
   }
 
   int *viewport_data = (int *)data;
   *x_ret = viewport_data[0];
   *y_ret = viewport_data[1];
+  free(data);
 
   return XDO_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -1800,18 +1800,21 @@ int xdo_get_desktop_viewport(const xdo_t xdo, int x_ret, int *y_ret) {`
`1800`	`1800`	`"Got unexpected type returned from _NET_DESKTOP_VIEWPORT."`
`1801`	`1801`	`" Expected CARDINAL, got %s\n",`
`1802`	`1802`	`XGetAtomName(xdo->xdpy, type));`
	`1803`	`+ free(data);`
`1803`	`1804`	`return XDO_ERROR;`
`1804`	`1805`	`}`
`1805`	`1806`
`1806`	`1807`	`if (nitems != 2) {`
`1807`	`1808`	`fprintf(stderr, "Expected 2 items for _NET_DESKTOP_VIEWPORT, got %ld\n",`
`1808`	`1809`	`nitems);`
	`1810`	`+ free(data);`
`1809`	`1811`	`return XDO_ERROR;`
`1810`	`1812`	`}`
`1811`	`1813`
`1812`	`1814`	`int viewport_data = (int )data;`
`1813`	`1815`	`*x_ret = viewport_data[0];`
`1814`	`1816`	`*y_ret = viewport_data[1];`
	`1817`	`+ free(data);`
`1815`	`1818`
`1816`	`1819`	`return XDO_SUCCESS;`
`1817`	`1820`	`}`