[gst-cvs] gst-plugins-good: jpeg: don't directly access message, some message have args

Stefan Kost ensonic at kemper.freedesktop.org
Tue Feb 2 07:25:00 PST 2010


Module: gst-plugins-good
Branch: master
Commit: a9f5bbe1ffbe5c09ecb7ecff478587ee0a09dfec
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=a9f5bbe1ffbe5c09ecb7ecff478587ee0a09dfec

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Tue Feb  2 13:41:03 2010 +0200

jpeg: don't directly access message, some message have args

This caused bogus messages, such as reported in bug #607471.

---

 ext/jpeg/gstjpegdec.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 6412e73..91bca55 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -1256,9 +1256,12 @@ wrong_size:
   }
 decode_error:
   {
+    gchar err_msg[JMSG_LENGTH_MAX];
+
+    dec->jerr.pub.format_message ((j_common_ptr) (&dec->cinfo), err_msg);
+
     GST_ELEMENT_ERROR (dec, STREAM, DECODE,
-        (_("Failed to decode JPEG image")),
-        ("Error #%u: %s", code, dec->jerr.pub.jpeg_message_table[code]));
+        (_("Failed to decode JPEG image")), ("Error #%u: %s", code, err_msg));
     if (outbuf) {
       gst_buffer_unref (outbuf);
       outbuf = NULL;





More information about the Gstreamer-commits mailing list