[Pkg-cli-libs-commits] [SCM] gstreamer-sharp branch, master, updated. upstream/0.9.2-25-gaa172ed
Chow Loong Jin
hyperair at ubuntu.com
Sat Aug 13 09:15:45 UTC 2011
The following commit has been merged in the master branch:
commit cdbc7242ba89a01ffc88ded55e612bcc048efc37
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sat Aug 13 16:33:02 2011 +0800
Add patch to fix NRE in Gst.Message
diff --git a/debian/patches/fix-gst-message-nre.patch b/debian/patches/fix-gst-message-nre.patch
new file mode 100644
index 0000000..a84e469
--- /dev/null
+++ b/debian/patches/fix-gst-message-nre.patch
@@ -0,0 +1,24 @@
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Description: Fix NRE in Gst.Message when src is null.
+Index: gstreamer-sharp/gstreamer-sharp/Message.custom
+===================================================================
+--- gstreamer-sharp.orig/gstreamer-sharp/Message.custom 2011-08-13 16:32:26.434945078 +0800
++++ gstreamer-sharp/gstreamer-sharp/Message.custom 2011-08-13 16:50:46.636094049 +0800
+@@ -118,7 +118,7 @@
+ static extern IntPtr gst_message_new_eos (IntPtr src);
+
+ public static Message NewEos (Gst.Object src) {
+- Message msg = (Message) Gst.MiniObject.GetObject (gst_message_new_eos (src.Handle), true);
++ Message msg = (Message) Gst.MiniObject.GetObject (gst_message_new_eos (src != null ? src.Handle : IntPtr.Zero), true);
+
+ return msg;
+ }
+@@ -154,7 +154,7 @@
+
+ IntPtr raw_ptr = (debug == null) ? IntPtr.Zero : Gst.GLib.Marshaller.StringToPtrGStrdup (debug);
+
+- Message msg = (Message) Gst.MiniObject.GetObject (gst_message_new_error (src.Handle, ref err, raw_ptr), true);
++ Message msg = (Message) Gst.MiniObject.GetObject (gst_message_new_error (src != null ? src.Handle : IntPtr.Zero, ref err, raw_ptr), true);
+
+ Gst.GLib.Marshaller.Free (raw_ptr);
+ err.Unset ();
diff --git a/debian/patches/series b/debian/patches/series
index e2cbdcd..4517104 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0001-Fix-dllmap-syntax-error.patch
set-pc-cli-path.patch
add-dllmap.patch
+fix-gst-message-nre.patch
--
gstreamer-sharp
More information about the Pkg-cli-libs-commits
mailing list