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

Bug#689145: unblock: libcroco/0.6.6-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

please unblock libcroco for a new bugfix release.

libcroco (0.6.6-1) unstable; urgency=low

  [ Michael Biebl ]
  * Fix typo in package description. Closes: #667847

  [ Josselin Mouette ]
  * New upstream bugfix release.

Upstream changes:
 0.6.6
     * Mem leak fixes (#678736)

unblock libcroco/0.6.6-1

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-
--- libcroco-0.6.5/configure.in	2012-03-26 14:02:34.000000000 +0200
+++ libcroco-0.6.6/configure.in	2012-03-26 14:07:02.000000000 +0200
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.5)
-AC_INIT([libcroco],[0.6.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=libcroco],[libcroco])
+AC_INIT([libcroco],[0.6.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=libcroco],[libcroco])
 AC_CONFIG_SRCDIR([src/cr-input.c])
 AC_CANONICAL_HOST
 
@@ -16,7 +16,7 @@
 
 LIBCROCO_MAJOR_VERSION=0
 LIBCROCO_MINOR_VERSION=6
-LIBCROCO_MICRO_VERSION=5
+LIBCROCO_MICRO_VERSION=6
 
 LIBCROCO_CURRENT=3
 LIBCROCO_REVISION=1
--- libcroco-0.6.5/debian/changelog	2012-03-26 23:22:24.000000000 +0200
+++ libcroco-0.6.6/debian/changelog	2012-09-29 15:30:30.000000000 +0200
@@ -1,3 +1,13 @@
+libcroco (0.6.6-1) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * Fix typo in package description. Closes: #667847
+
+  [ Josselin Mouette ]
+  * New upstream bugfix release.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 29 Sep 2012 15:30:22 +0200
+
 libcroco (0.6.5-1) unstable; urgency=low
 
   * New upstream release.
--- libcroco-0.6.5/debian/control.in	2012-03-26 23:21:44.000000000 +0200
+++ libcroco-0.6.6/debian/control.in	2012-04-07 07:28:42.000000000 +0200
@@ -26,7 +26,7 @@
  Services provided by Libcroco
   * A parser module that provides
     o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
-      API wich resembles SAX in the xml world.
+      API which resembles SAX in the xml world.
     o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
  .
     The libcroco parser implements the CSS Level 2 specification, the CSS
@@ -56,7 +56,7 @@
  Services provided by Libcroco
   * A parser module that provides
     o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
-      API wich resembles SAX in the xml world.
+      API which resembles SAX in the xml world.
     o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
  .
     The libcroco parser implements the CSS Level 2 specification, the CSS
@@ -83,7 +83,7 @@
  Services provided by Libcroco
   * A parser module that provides
     o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
-      API wich resembles SAX in the xml world.
+      API which resembles SAX in the xml world.
     o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
  .
     The libcroco parser implements the CSS Level 2 specification, the CSS
--- libcroco-0.6.5/src/cr-om-parser.c	2011-12-11 20:52:12.000000000 +0100
+++ libcroco-0.6.6/src/cr-om-parser.c	2012-09-16 19:16:50.000000000 +0200
@@ -142,7 +142,7 @@
 cr_om_parser_init_default_sac_handler (CROMParser * a_this)
 {
         CRDocHandler *sac_handler = NULL;
-        gboolean free_hdlr_if_error = FALSE;
+        gboolean created_handler = FALSE;
         enum CRStatus status = CR_OK;
 
         g_return_val_if_fail (a_this && PRIVATE (a_this)
@@ -155,7 +155,7 @@
 
         if (!sac_handler) {
                 sac_handler = cr_doc_handler_new ();
-                free_hdlr_if_error = TRUE;
+                created_handler = TRUE;
         }
 
         /*
@@ -177,15 +177,10 @@
         sac_handler->end_media = end_media;
         sac_handler->import_style = import_style;
 
-        status = cr_parser_set_sac_handler (PRIVATE (a_this)->parser,
-                                            sac_handler);
-        if (status == CR_OK) {
-                return CR_OK;
-        }
-
-        if (sac_handler && free_hdlr_if_error == TRUE) {
-                cr_doc_handler_destroy (sac_handler);
-                sac_handler = NULL;
+        if (created_handler) {
+                status = cr_parser_set_sac_handler (PRIVATE (a_this)->parser,
+                                                    sac_handler);
+                cr_doc_handler_unref (sac_handler);
         }
 
         return status;
--- libcroco-0.6.5/src/cr-string.c	2011-12-11 20:52:12.000000000 +0100
+++ libcroco-0.6.6/src/cr-string.c	2012-09-16 19:16:50.000000000 +0200
@@ -82,10 +82,10 @@
 		return NULL ;
 	}
 	if (a_string) {
-		result->stryng = g_string_new_len
-			(a_string->str, a_string->len) ;
-	} else {
-		result->stryng = g_string_new (NULL) ;
+		g_string_append_len (result->stryng,
+				     a_string->str,
+				     a_string->len);
+
 	}
 	return result ;
 }

Reply to: