head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2010Q3:1.3.0.2 pkgsrc-2010Q3-base:1.3 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q1:1.1.0.2 pkgsrc-2009Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2010.12.03.18.15.44; author drochner; state dead; branches; next 1.3; 1.3 date 2010.08.08.11.10.01; author jmcneill; state Exp; branches; next 1.2; 1.2 date 2009.05.25.16.10.52; author drochner; state dead; branches; next 1.1; 1.1 date 2009.03.23.12.03.24; author drochner; state Exp; branches; next ; desc @@ 1.4 log @update to 0.10.31 changes: many fixes and improvements - see the Changelog @ text @$NetBSD: patch-ad,v 1.3 2010/08/08 11:10:01 jmcneill Exp $ --- docs/libs/Makefile.in.orig 2010-08-08 11:00:20.000000000 +0000 +++ docs/libs/Makefile.in @@@@ -955,7 +955,7 @@@@ dist-hook: dist-check-gtkdoc dist-hook-l -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs @ 1.3 log @Fix build; replace 8 spaces with tab in Makefiles @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 0.10.23 changes: New navigation API to support DVD playback playbin2 improvements RTSP extensions to allow extra headers and options Replace audioresampler with speexresample based code Support interlacing flags in the gstvideo library Support new RIFF formats Improve typefinding Support more frame formats in videoscale Many other bug-fixes and improvements @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2009/03/23 12:03:24 drochner Exp $ d3 8 a10 4 --- gst-libs/gst/tag/gstvorbistag.c.orig 2008-10-11 01:22:50.000000000 +0200 +++ gst-libs/gst/tag/gstvorbistag.c @@@@ -305,30 +305,32 @@@@ gst_vorbis_tag_add (GstTagList * list, c } d12 1 a12 11 static void -gst_vorbis_tag_add_coverart (GstTagList * tags, const gchar * img_data_base64, +gst_vorbis_tag_add_coverart (GstTagList * tags, gchar * img_data_base64, gint base64_len) { GstBuffer *img; - guchar *img_data; gsize img_len; + guchar *out; guint save = 0; gint state = 0; a13 67 if (base64_len < 2) goto not_enough_data; - img_data = g_try_malloc0 (base64_len * 3 / 4); - - if (img_data == NULL) - goto alloc_failed; - - img_len = g_base64_decode_step (img_data_base64, base64_len, img_data, - &state, &save); + /* img_data_base64 points to a temporary copy of the base64 encoded data, so + * it's safe to do inpace decoding here + * TODO: glib 2.20 and later provides g_base64_decode_inplace, so change this + * to use glib's API instead once it's in wider use: + * http://bugzilla.gnome.org/show_bug.cgi?id=564728 + * http://svn.gnome.org/viewvc/glib?view=revision&revision=7807 */ + out = (guchar *) img_data_base64; + img_len = g_base64_decode_step (img_data_base64, base64_len, + out, &state, &save); if (img_len == 0) goto decode_failed; - img = gst_tag_image_data_to_image_buffer (img_data, img_len, + img = gst_tag_image_data_to_image_buffer (out, img_len, GST_TAG_IMAGE_TYPE_NONE); if (img == NULL) @@@@ -338,7 +340,6 @@@@ gst_vorbis_tag_add_coverart (GstTagList GST_TAG_PREVIEW_IMAGE, img, NULL); gst_buffer_unref (img); - g_free (img_data); return; /* ERRORS */ @@@@ -347,21 +348,14 @@@@ not_enough_data: GST_WARNING ("COVERART tag with too little base64-encoded data"); return; } -alloc_failed: - { - GST_WARNING ("Couldn't allocate enough memory to decode COVERART tag"); - return; - } decode_failed: { - GST_WARNING ("Couldn't decode bas64 image data from COVERART tag"); - g_free (img_data); + GST_WARNING ("Couldn't decode base64 image data from COVERART tag"); return; } convert_failed: { GST_WARNING ("Couldn't extract image or image type from COVERART tag"); - g_free (img_data); return; } } @@@@ -457,6 +451,7 @@@@ error: return NULL; #undef ADVANCE } + typedef struct { guint count; @ 1.1 log @add a patch from upstream to fix a buffer overflow in vorbis coverart code (CVE-2009-0586), bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @