| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 2169f2205c0205a220d826d7573e5a863bd36e0a Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 |
| 4 | Subject: [PATCH] ensure valid sentinal for gst_structure_get() |
| 5 | |
| 6 | gst_structure_get() is declared with G_GNUC_NULL_TERMINATED, ie |
| 7 | __attribute__((__sentinel__)), which means gcc will generate a |
| 8 | warning if the last parameter passed to the function is not NULL |
| 9 | (where a valid NULL in this context is defined as zero with any |
| 10 | pointer type). |
| 11 | |
| 12 | The C code callers to gst_structure_get() within gst-plugins-good |
| 13 | use the C NULL definition (ie ((void*)0)), which is a valid sentinel. |
| 14 | |
| 15 | However gstid3v2mux.cc uses the C++ NULL definition (ie 0L), which |
| 16 | is not a valid sentinel without an explicit cast to a pointer type. |
| 17 | |
| 18 | Upstream-Status: Pending |
| 19 | |
| 20 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 21 | --- |
| 22 | ext/taglib/gstid3v2mux.cc | 2 +- |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 24 | |
| 25 | diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc |
| 26 | index 8651e77..a87234f 100644 |
| 27 | --- a/ext/taglib/gstid3v2mux.cc |
| 28 | +++ b/ext/taglib/gstid3v2mux.cc |
| 29 | @@ -465,7 +465,7 @@ add_image_tag (ID3v2::Tag * id3v2tag, const GstTagList * list, |
| 30 | |
| 31 | if (info_struct) { |
| 32 | if (gst_structure_get (info_struct, "image-type", |
| 33 | - GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) { |
| 34 | + GST_TYPE_TAG_IMAGE_TYPE, &image_type, (void *) NULL)) { |
| 35 | if (image_type > 0 && image_type <= 18) { |
| 36 | image_type += 2; |
| 37 | } else { |
| 38 | -- |
| 39 | 1.9.1 |
| 40 | |