frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/common: Remove a configScreen leak when conf_screen is NULL 

configScreen used a dynamically allocated buffer for XF86ConfScreenRec
when conf_screen argument was NULL. This pointer was never stored
anywhere, nor was it released, so this patch makes the function use
automatically allocated storage in that situation.

[ajax: minor grammar fix]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
This commit is contained in:
Erkki Seppälä 2011-03-08 13:29:41 -05:00 committed by Adam Jackson
parent b73ebe65cd
commit a19771e433
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Config.c
View File

@ -1787,9 +1787,11 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
XF86ConfDisplayPtr dispptr; XF86ConfDisplayPtr dispptr;
XF86ConfAdaptorLinkPtr conf_adaptor; XF86ConfAdaptorLinkPtr conf_adaptor;
Bool defaultMonitor = FALSE; Bool defaultMonitor = FALSE;
XF86ConfScreenRec local_conf_screen;
if (!conf_screen) { if (!conf_screen) {
conf_screen = xnfcalloc(1, sizeof(XF86ConfScreenRec)); memset(&local_conf_screen, 0, sizeof(local_conf_screen));
conf_screen = &local_conf_screen;
conf_screen->scrn_identifier = "Default Screen Section"; conf_screen->scrn_identifier = "Default Screen Section";
xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n"); xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n");
} }