diff options
| author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2018-11-04 14:35:07 +0100 |
|---|---|---|
| committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2018-11-04 14:35:07 +0100 |
| commit | d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3 (patch) | |
| tree | 3727b34ad0bbcfa79d4c9f62ec291a06f5fb17d9 | |
| parent | b4d68d4daa2716c0064605a2a92082a7287ee54a (diff) | |
| download | st-d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3.tar.gz st-d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3.zip | |
fix memory leak in xloadcols()
reported by Avi Halachmi (:avih)" <avihpit@yahoo.com>
patch slightly changed by me.
| -rw-r--r-- | x.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -733,12 +733,12 @@ xloadcols(void) | |||
| 733 | static int loaded; | 733 | static int loaded; |
| 734 | Color *cp; | 734 | Color *cp; |
| 735 | 735 | ||
| 736 | dc.collen = MAX(LEN(colorname), 256); | ||
| 737 | dc.col = xmalloc(dc.collen * sizeof(Color)); | ||
| 738 | |||
| 739 | if (loaded) { | 736 | if (loaded) { |
| 740 | for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) | 737 | for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) |
| 741 | XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); | 738 | XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); |
| 739 | } else { | ||
| 740 | dc.collen = MAX(LEN(colorname), 256); | ||
| 741 | dc.col = xmalloc(dc.collen * sizeof(Color)); | ||
| 742 | } | 742 | } |
| 743 | 743 | ||
| 744 | for (i = 0; i < dc.collen; i++) | 744 | for (i = 0; i < dc.collen; i++) |
