[SCM] vdpau-video/master: Possible fix for SIGFPE

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ae78f78b28c8db6826f1daa97815d0bb94a5fc8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 2 20:53:26 2014 +0200

    Possible fix for SIGFPE
    
    Closes: #748294

diff --git a/debian/patches/series b/debian/patches/series
index bc4776d..b05db54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 cast.patch
 GL-version-1_3.patch
 libva-constants.patch
+sigfpe-crash.patch
diff --git a/debian/patches/sigfpe-crash.patch b/debian/patches/sigfpe-crash.patch
new file mode 100644
index 0000000..e2fe02c
--- /dev/null
+++ b/debian/patches/sigfpe-crash.patch
@@ -0,0 +1,21 @@
+Description: Fix a crash if a heap is destroyed before being initialized
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=58836
+Bug-Debian: http://bugs.debian.org/748294
+Last-Update: 2014-06-02
+
+--- vdpau-video-0.7.4.orig/src/object_heap.c
++++ vdpau-video-0.7.4/src/object_heap.c
+@@ -272,8 +272,10 @@ object_heap_destroy(object_heap_p heap)
+         ASSERT(obj->next_free != ALLOCATED);
+     }
+ 
+-    for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
+-        free(heap->bucket[i]);
++    if (heap->bucket) {
++        for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
++            free(heap->bucket[i]);
++        }
+     }
+ 
+     pthread_mutex_destroy(&heap->mutex);

-- 
vdpau-video packaging