[libgsf] zip: fix translation issue and leak.



commit 7f2c2c684ef16863c0442a124933295bda2a8696
Author: Morten Welinder <terra gnome org>
Date:   Fri Sep 13 12:40:36 2013 -0400

    zip: fix translation issue and leak.

 ChangeLog            |    5 +++++
 NEWS                 |    3 +++
 gsf/gsf-infile-zip.c |    6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ea07689..6f4718a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-13  Morten Welinder  <terra gnome org>
+
+       * gsf/gsf-infile-zip.c (zip_child_init): Fix translation marking,
+       plug leak.  Fixes #706937.
+
 2013-08-23  Morten Welinder  <terra gnome org>
 
        * gsf/gsf-outfile-stdio.c (gsf_outfile_stdio_new_valist): Allow
diff --git a/NEWS b/NEWS
index 2605556..5fd255c 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ libgsf 1.14.29
 Allin Cottrell:
        * Fix problem with GsfOutfileStdio.  [#706219]
 
+Morten:
+       * Fix translation issue and leak.  [#706937]
+
 --------------------------------------------------------------------------
 libgsf 1.14.28
 
diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c
index 82dbfba..01b7aa6 100644
--- a/gsf/gsf-infile-zip.c
+++ b/gsf/gsf-infile-zip.c
@@ -420,12 +420,12 @@ zip_child_init (GsfInfileZip *child, GError **errmsg)
        if (gsf_input_seek (child->source, (gsf_off_t) dirent->offset, G_SEEK_SET))
                err = _("Error seeking to zip header");
        else if (NULL == (data = gsf_input_read (child->source, ZIP_FILE_HEADER_SIZE, NULL)))
-               err = g_strdup_printf ("Error reading %d bytes in zip header", ZIP_FILE_HEADER_SIZE);
+               err = _("Error reading zip header");
        else if (0 != memcmp (data, header_signature, sizeof (header_signature))) {
                err = _("Error incorrect zip header");
-               g_print ("Header is :\n");
+               g_printerr ("Header is :\n");
                gsf_mem_dump (data, sizeof (header_signature));
-               g_print ("Header should be :\n");
+               g_printerr ("Header should be :\n");
                gsf_mem_dump (header_signature, sizeof (header_signature));
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]