diff --git a/ChangeLog b/ChangeLog index cf1750ea68..96a5ca09fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-07-23 Tim-Philipp Müller + + Patch by: Damien Lespiau + + * gst-libs/gst/sdp/gstsdpmessage.c: (print_media): + Use GST_STR_NULL to avoid crashes with libcs that don't + like NULL strings in printf args (such as the win32 one). + Fixes #544306. + 2008-07-17 Jan Schmidt * sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): diff --git a/common b/common index a100efef18..e79879859b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a100efef186a5f8999fe3aa42c0720f5123c08eb +Subproject commit e79879859bc866545379eb77e1378a906dc30ebf diff --git a/gst-libs/gst/sdp/gstsdpmessage.c b/gst-libs/gst/sdp/gstsdpmessage.c index 0954ef3378..ed97aa910d 100644 --- a/gst-libs/gst/sdp/gstsdpmessage.c +++ b/gst-libs/gst/sdp/gstsdpmessage.c @@ -1876,10 +1876,10 @@ gst_sdp_message_parse_buffer (const guint8 * data, guint size, static void print_media (GstSDPMedia * media) { - g_print (" media: '%s'\n", media->media); + g_print (" media: '%s'\n", GST_STR_NULL (media->media)); g_print (" port: '%u'\n", media->port); g_print (" num_ports: '%u'\n", media->num_ports); - g_print (" proto: '%s'\n", media->proto); + g_print (" proto: '%s'\n", GST_STR_NULL (media->proto)); if (media->fmts->len > 0) { guint i; @@ -1888,10 +1888,10 @@ print_media (GstSDPMedia * media) g_print (" format '%s'\n", g_array_index (media->fmts, gchar *, i)); } } - g_print (" information: '%s'\n", media->information); + g_print (" information: '%s'\n", GST_STR_NULL (media->information)); g_print (" key:\n"); - g_print (" type: '%s'\n", media->key.type); - g_print (" data: '%s'\n", media->key.data); + g_print (" type: '%s'\n", GST_STR_NULL (media->key.type)); + g_print (" data: '%s'\n", GST_STR_NULL (media->key.data)); if (media->attributes->len > 0) { guint i;