← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xorg-server/vivid

« back to all changes in this revision

Viewing changes to debian/patches/167_nullptr_xisbread.patch

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-07-03 12:03:57 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20130703120357-caosebpn11zu2zj0
Tags: 2:1.14.1-0ubuntu0.8
Use correct version for libxfixes3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/167_nullptr_xisbread.patch
1
 
diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
2
 
index 3568a57..6eaf594 100644
3
 
--- a/hw/xfree86/common/xisb.c
4
 
+++ b/hw/xfree86/common/xisb.c
5
 
@@ -96,6 +96,9 @@ XisbRead(XISBuffer * b)
6
 
 {
7
 
     int ret;
8
 
 
9
 
+    if (b == NULL)
10
 
+        return -2;
11
 
+
12
 
     if (b->current >= b->end) {
13
 
         if (b->block_duration >= 0) {
14
 
             if (xf86WaitForInput(b->fd, b->block_duration) < 1)