summaryrefslogtreecommitdiffstats
path: root/main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch')
-rw-r--r--main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch b/main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch
deleted file mode 100644
index 3b6bc15b8..000000000
--- a/main/libxxf86vm/0003-Unlock-display-before-returning-alloc-error-in-XF86V.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8ed00bd0a7c44c7fece687e2566d920ea74ef809 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 13 Apr 2013 17:52:12 -0700
-Subject: [PATCH 3/8] Unlock display before returning alloc error in
- XF86VidModeGetModeLine()
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/XF86VMode.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/XF86VMode.c b/src/XF86VMode.c
-index 165f8ba..28c79c1 100644
---- a/src/XF86VMode.c
-+++ b/src/XF86VMode.c
-@@ -203,6 +203,7 @@ XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
- xXF86OldVidModeGetModeLineReply oldrep;
- xXF86VidModeGetModeLineReq *req;
- int majorVersion, minorVersion;
-+ Bool result = True;
-
- XF86VidModeCheckExtension (dpy, info, False);
- XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
-@@ -254,17 +255,18 @@ XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
- }
-
- if (modeline->privsize > 0) {
-- if (!(modeline->private = Xcalloc(modeline->privsize, sizeof(INT32)))) {
-+ modeline->private = Xcalloc(modeline->privsize, sizeof(INT32));
-+ if (modeline->private == NULL) {
- _XEatData(dpy, (modeline->privsize) * sizeof(INT32));
-- return False;
-- }
-- _XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32));
-+ result = False;
-+ } else
-+ _XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32));
- } else {
- modeline->private = NULL;
- }
- UnlockDisplay(dpy);
- SyncHandle();
-- return True;
-+ return result;
- }
-
- Bool
---
-1.8.2.3
-