[repo.or.cz] wmaker-crm.git branch master updated: wmaker-0.96.0-65-g955c6793a6cf

[crmafra]

This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.

The branch, master has been updated
via 955c6793a6cf22b1b9fe33f8bf1198dd43bd1e18 (commit)
from 189679b49c601710477d2d48c5a96ccb4faf70eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 955c6793a6cf22b1b9fe33f8bf1198dd43bd1e18
Author: David Maciejak <david.m...@gmail.com>
Date: Sun, 15 Feb 2026 17:47:01 -0500
URL: <https://repo.or.cz/wmaker-crm.git/955c6793a6cf22b1>

WINGs: fix memory leaks and potential buffer over-read in wfont

This patch is fixing memory leaks when pango structures are used
but not freed.
Also according to commit 4f050ebab997782461d7c6b65dea7b535916329f,
previous_text string in WMWidthOfString can be not NULL terminated,
the same construct is used in WMDrawString and WMDrawImageString
functions, so to be safe better to also check for the length
of the string.
---
WINGs/wfont.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/WINGs/wfont.c b/WINGs/wfont.c
index b464b6ca7418..652a5cd9c7e5 100644
--- a/WINGs/wfont.c
+++ b/WINGs/wfont.c
@@ -174,6 +174,10 @@ WMFont *WMCreateFont(WMScreen * scrPtr, const char *fontName)
pango_layout_set_font_description(layout, description);

font->layout = layout;
+
+ pango_font_description_free(description);
+ g_object_unref(context);
+ FcPatternDestroy(pattern);
#endif

assert(WMHashInsert(scrPtr->fontCache, font->name, font) == NULL);
@@ -197,6 +201,11 @@ void WMReleaseFont(WMFont * font)
font->refCount--;
if (font->refCount < 1) {
XftFontClose(font->screen->display, font->font);
+#ifdef USE_PANGO
+ if (font->layout) {
+ g_object_unref(font->layout);
+ }
+#endif
if (font->name) {
WMHashRemove(font->screen->fontCache, font->name);
wfree(font->name);
@@ -331,7 +340,7 @@ void WMDrawString(WMScreen * scr, Drawable d, WMColor * color, WMFont * font, in

#ifdef USE_PANGO
previous_text = pango_layout_get_text(font->layout);
- if ((previous_text == NULL) || (strcmp(text, previous_text) != 0))
+ if ((previous_text == NULL) || (strncmp(text, previous_text, length) != 0) || previous_text[length] != '\0')
pango_layout_set_text(font->layout, text, length);
pango_xft_render_layout(scr->xftdraw, &xftcolor, font->layout, x * PANGO_SCALE, y * PANGO_SCALE);
#else
@@ -369,7 +378,7 @@ WMDrawImageString(WMScreen * scr, Drawable d, WMColor * color, WMColor * backgro

#ifdef USE_PANGO
previous_text = pango_layout_get_text(font->layout);
- if ((previous_text == NULL) || (strcmp(text, previous_text) != 0))
+ if ((previous_text == NULL) || (strncmp(text, previous_text, length) != 0) || previous_text[length] != '\0')
pango_layout_set_text(font->layout, text, length);
pango_xft_render_layout(scr->xftdraw, &textColor, font->layout, x * PANGO_SCALE, y * PANGO_SCALE);
#else

-----------------------------------------------------------------------

Summary of changes:
WINGs/wfont.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)


repo.or.cz automatic notification. Contact project admin crm...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")