enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore-drm should not use sscanf when getting logind vt 

this should be more robust for when something like "/dev/tty4" is passed

@fix
This commit is contained in:
Mike Blumenkrantz 2015-02-10 16:23:17 -05:00
parent b5011fa867
commit c0683bc2dd
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/ecore_drm/ecore_drm_logind.c
View File

@ -1,4 +1,5 @@
#include "ecore_drm_private.h"
#include <ctype.h>
#ifndef KDSKBMUTE
# define KDSKBMUTE 0x4B51
@ -11,7 +12,7 @@ static inline Eina_Bool
_ecore_drm_logind_vt_get(Ecore_Drm_Device *dev)
{
int ret;
char *tty;
char *tty, *p;
ret = sd_session_get_tty(dev->session, &tty);
if (ret < 0)
@ -20,12 +21,18 @@ _ecore_drm_logind_vt_get(Ecore_Drm_Device *dev)
return EINA_FALSE;
}
ret = sscanf(tty, "tty%u", &dev->vt);
p = strchr(tty, 't');
dev->vt = UINT_MAX;
if (p)
{
while (p[0] && (!isdigit(p[0])))
p++;
if (p[0])
dev->vt = strtoul(p, NULL, 10);
}
free(tty);
if (ret != 1) return EINA_FALSE;
return EINA_TRUE;
return dev->vt != UINT_MAX;
}
#endif