From 56f66684592abf257c4004e6e1fff041c64a12ce Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko Date: Sun, 14 May 2017 21:28:00 +0300 Subject: [PATCH] Fix potential access violation, use runtime user dir instead of tmp dir. Note: it limits libmenu-cache compatibility to menu-cached >= 0.7.0. --- NEWS | 3 +++ libmenu-cache/menu-cache.c | 7 ++++++- menu-cache-daemon/menu-cached.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f7f12e6..6177e9d 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,9 @@ * Added new API menu_cache_app_get_generic_name() to get generic name for application. +* Fixed potential access violation, use runtime user dir instead of tmp dir. + It limits libmenu-cache compatibility to menu-cached >= 0.7.0. + Changes in 1.0.2 since 1.0.1: diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c index 9e3e0db..d914127 100644 --- a/libmenu-cache/menu-cache.c +++ b/libmenu-cache/menu-cache.c @@ -3,7 +3,7 @@ * * Copyright 2008 PCMan * Copyright 2009 Jürgen Hötzel - * Copyright 2012-2015 Andriy Grytsenko (LStranger) + * Copyright 2012-2017 Andriy Grytsenko (LStranger) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1538,8 +1538,13 @@ static void get_socket_name( char* buf, int len ) if(*p) *p = '\0'; } +#if GLIB_CHECK_VERSION(2, 28, 0) + g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(), + dpy ? dpy : ":0" ); +#else g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(), dpy ? dpy : ":0", g_get_user_name() ); +#endif g_free(dpy); } diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c index a6895ee..c100484 100644 --- a/menu-cache-daemon/menu-cached.c +++ b/menu-cache-daemon/menu-cached.c @@ -473,6 +473,9 @@ static void get_socket_name( char* buf, int len ) if(*p) *p = '\0'; } + /* NOTE: this socket name is incompatible with versions > 1.0.2, + although this function is never used since 0.7.0 but + libmenu-cache always requests exact socket name instead */ g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(), dpy ? dpy : ":0", g_get_user_name() ); g_free(dpy); -- 2.1.4