fix to not sometimes read beyond the end of the string.

	* libsoup/soup-headers.c (soup_header_parse_quality_list): fix to
	not sometimes read beyond the end of the string.

	* libsoup/soup-message-body.c (soup_message_body_append): When
	appending a 0-length SOUP_MEMORY_TAKE buffer, we need to free the
	passed-in buffer rather than just ignoring it.

	* libsoup/soup-server.c (got_headers): fix leak when decoding path

	* libsoup/soup-session.c (finalize): free ntlm_manager

	* tests/libsoup.supp: update for libsoup 2.4, glib 2.14, etc

	* tests/header-parsing.c (do_qvalue_tests):
	* tests/uri-parsing.c (main): more cleanup

svn path=/trunk/; revision=1055

diff --git a/ChangeLog b/ChangeLog
index 4307310..711a058 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2008-01-27  Dan Winship  <danw@gnome.org>
 
+       * libsoup/soup-headers.c (soup_header_parse_quality_list): fix to
+       not sometimes read beyond the end of the string.
+
+       * libsoup/soup-message-body.c (soup_message_body_append): When
+       appending a 0-length SOUP_MEMORY_TAKE buffer, we need to free the
+       passed-in buffer rather than just ignoring it.
+
+       * libsoup/soup-server.c (got_headers): fix leak when decoding path
+
+       * libsoup/soup-session.c (finalize): free ntlm_manager
+
+       * tests/libsoup.supp: update for libsoup 2.4, glib 2.14, etc
+
+       * tests/header-parsing.c (do_qvalue_tests):
+       * tests/uri-parsing.c (main): more cleanup
+
+2008-01-27  Dan Winship  <danw@gnome.org>
+
        * libsoup/soup-logger.c (soup_logger_attach): Fix session ids by
        using weak refs for the logger cleanup rather than trying to use
        the same qdata for two different things.

diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
index 19a298b..79e512f 100644 (file)
--- a/libsoup/soup-headers.c
+++ b/libsoup/soup-headers.c
@@ -468,12 +468,14 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
                                continue;
                        qval = (double)(value[0] - '0');
                        if (value[0] == '0' && value[1] == '.') {
-                               if (g_ascii_isdigit (value[2]))
+                               if (g_ascii_isdigit (value[2])) {
                                        qval += (double)(value[2] - '0') / 10;
-                               if (g_ascii_isdigit (value[3]))
-                                       qval += (double)(value[3] - '0') / 100;
-                               if (g_ascii_isdigit (value[4]))
-                                       qval += (double)(value[4] - '0') / 1000;
+                                       if (g_ascii_isdigit (value[3])) {
+                                               qval += (double)(value[3] - '0') / 100;
+                                               if (g_ascii_isdigit (value[4]))
+                                                       qval += (double)(value[4] - '0') / 1000;
+                                       }
+                               }
                        }
 
                        *semi = '\0';

diff --git a/libsoup/soup-message-body.c b/libsoup/soup-message-body.c
index effabd7..20b8980 100644 (file)
--- a/libsoup/soup-message-body.c
+++ b/libsoup/soup-message-body.c
@@ -272,6 +272,8 @@ soup_message_body_append (SoupMessageBody *body, SoupMemoryUse use,
 {
        if (length > 0)
                append_buffer (body, soup_buffer_new (use, data, length));
+       else if (use == SOUP_MEMORY_TAKE)
+               g_free ((gpointer)data);
 }
 
 /**

diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 933c80f..b8bf3bd 100644 (file)
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -624,6 +624,7 @@ got_headers (SoupMessage *req, SoupClientContext *client)
                uri = soup_message_get_uri (req);
                decoded_path = soup_uri_decode (uri->path);
                soup_uri_set_path (uri, decoded_path);
+               g_free (decoded_path);
        }
 
        /* Add required response headers */

diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 07f1e2e..ff1f0d5 100644 (file)
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -192,6 +192,8 @@ finalize (GObject *object)
        g_hash_table_destroy (priv->conns);
 
        soup_auth_manager_free (priv->auth_manager);
+       if (priv->ntlm_manager)
+               soup_auth_manager_ntlm_free (priv->ntlm_manager);
 
        if (priv->proxy_uri)
                soup_uri_free (priv->proxy_uri);

diff --git a/tests/header-parsing.c b/tests/header-parsing.c
index 0f92c02..854efef 100644 (file)
--- a/tests/header-parsing.c
+++ b/tests/header-parsing.c
@@ -745,6 +745,7 @@ do_qvalue_tests (void)
                                        wrong = TRUE;
                        }
                        debug_printf (1, "\n");
+                       soup_header_free_list (acceptable);
                } else
                        debug_printf (1, "(none)\n");
                if (wrong) {
@@ -765,6 +766,7 @@ do_qvalue_tests (void)
                                        wrong = TRUE;
                        }
                        debug_printf (1, "\n");
+                       soup_header_free_list (unacceptable);
                } else
                        debug_printf (1, "(none)\n");
                if (wrong) {

diff --git a/tests/libsoup.supp b/tests/libsoup.supp
index a747063..eb14a5a 100644 (file)
--- a/tests/libsoup.supp
+++ b/tests/libsoup.supp
@@ -6,9 +6,9 @@
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
-   fun:g_hash_node_new
+   fun:g_hash_table_insert_internal
    fun:g_hash_table_insert
-   fun:g_quark_from_static_string
+   fun:g_quark_new
 }
 {
    glib/quark2
@@ -16,7 +16,7 @@
    fun:malloc
    fun:realloc
    fun:g_realloc
-   fun:g_quark_from_static_string
+   fun:g_quark_new
 }
 {
    glib/quark3
@@ -25,65 +25,30 @@
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_hash_table_new_full
-   fun:g_quark_from_static_string
+   fun:g_hash_table_new
+   fun:g_quark_new
 }
 {
    glib/quark4
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_quark_from_string
-}
-{
-   glib/quark5
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_quark_from_string
-}
-{
-   glib/quark6
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_node_new
-   fun:g_hash_table_insert
-   fun:g_quark_from_string
-}
-{
-   glib/quark7
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_new_full
-   fun:g_quark_from_string
-}
-{
-   glib/quark8
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_quark_from_string
-}
-{
-   glib/quark9
-   Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_hash_table_resize
-   fun:g_quark_from_string
+   fun:g_hash_table_maybe_resize
+   fun:g_hash_table_insert_internal
+   fun:g_hash_table_insert
+   fun:g_quark_new
 }
 {
    glib/typeinit1
    Memcheck:Leak
    fun:realloc
    fun:g_realloc
+   fun:g_bsearch_array_grow
+   fun:g_bsearch_array_insert
+   fun:g_bsearch_array_replace
    fun:g_value_register_transform_func
+   fun:g_value_transforms_init
    fun:g_type_init_with_debug_flags
 }
 {
@@ -91,8 +56,8 @@
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
-   fun:type_data_make_W
-   fun:g_type_init_with_debug_flags
+   fun:type_class_init_Wm
+   fun:g_type_class_ref
 }
 {
    glib/typeinit3
@@ -104,6 +69,14 @@
    fun:g_type_init_with_debug_flags
 }
 {
+   glib/typeinit4
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:type_data_make_W
+   fun:g_type_init_with_debug_flags
+}
+{
    glib/property
    Memcheck:Leak
    fun:malloc
@@ -137,6 +110,15 @@
    fun:g_param_spec_types_init
 }
 {
+   glib/boxedtype
+   Memcheck:Leak
+   fun:realloc
+   fun:g_realloc
+   fun:g_bsearch_array_grow
+   fun:g_bsearch_array_insert
+   fun:g_boxed_type_register_static
+}
+{
    glib/typereg1
    Memcheck:Leak
    fun:calloc
@@ -158,7 +140,11 @@
    fun:calloc
    fun:g_malloc0
    fun:g_hash_table_resize
+   fun:g_hash_table_maybe_resize
+   fun:g_hash_table_insert_internal
+   fun:g_hash_table_insert
    fun:type_node_any_new_W
+   fun:type_node_new_W
    fun:g_type_register_static
 }
 {
@@ -175,6 +161,7 @@
    fun:calloc
    fun:g_malloc0
    fun:type_node_any_new_W
+   fun:type_node_new_W
    fun:g_type_register_static
 }
 {
@@ -183,6 +170,7 @@
    fun:realloc
    fun:g_realloc
    fun:type_node_any_new_W
+   fun:type_node_new_W
    fun:g_type_register_static
 }
 {
@@ -204,31 +192,55 @@
    fun:g_type_register_static
 }
 {
-   glib/typeregf1
+   glib/typereg9
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
-   fun:type_data_make_W
+   fun:type_set_qdata_W
+   fun:type_add_flags_W
    fun:g_type_register_fundamental
 }
 {
-   glib/typeregf2
+   glib/typereg10
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
+   fun:type_set_qdata_W
    fun:type_add_flags_W
    fun:g_type_register_fundamental
 }
 {
-   glib/typeregf3
+   glib/typereg11
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
-   fun:type_add_flags_W
+   fun:type_data_make_W
    fun:g_type_register_fundamental
 }
 {
+   glib/typereg12
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:g_realloc
+   fun:type_node_any_new_W
+   fun:type_node_new_W
+   fun:g_type_register_static
+}
+{
+   glib/typereg13
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:g_quark_from_string_internal
+   fun:g_quark_from_string
+   fun:type_node_any_new_W
+   fun:type_node_new_W
+   fun:g_type_register_static
+}
+{
    glib/interface1
    Memcheck:Leak
    fun:calloc
@@ -282,7 +294,15 @@
    fun:g_param_spec_internal
 }
 {
-   glib/signalinit
+   glib/paramspec3
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:g_param_spec_string
+}
+{
+   glib/signalinit1
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
@@ -290,6 +310,23 @@
    fun:g_signal_init
 }
 {
+   glib/signalinit2
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:g_realloc
+   fun:g_bsearch_array_create
+   fun:g_signal_init
+}
+{
+   glib/signalinit3
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:g_realloc
+   fun:g_signal_init
+}
+{
    glib/signal1
    Memcheck:Leak
    fun:malloc
@@ -343,6 +380,44 @@
    fun:g_signal_newv
 }
 {
+   glib/signal8
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:g_quark_from_string_internal
+   fun:g_quark_from_string
+   fun:g_signal_newv
+}
+{
+   glib/signal9
+   Memcheck:Leak
+   fun:realloc
+   fun:g_realloc
+   fun:g_bsearch_array_grow
+   fun:g_bsearch_array_insert
+   fun:g_signal_newv
+}
+{
+   glib/signal10
+   Memcheck:Leak
+   fun:realloc
+   fun:g_realloc
+   fun:g_bsearch_array_grow
+   fun:g_bsearch_array_insert
+   fun:signal_add_class_closure
+   fun:g_signal_newv
+}
+{
+   glib/signal11
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:g_hash_table_new_full
+   fun:g_hash_table_new
+   fun:g_signal_init
+}
+{
    glib/gslice
    Memcheck:Leak
    fun:calloc
@@ -384,21 +459,10 @@
 {
    glib/typeref5
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_new_full
-   fun:g_param_spec_pool_new
-   fun:g_object_do_class_init
-   fun:g_type_class_ref
-}
-{
-   glib/typeref6
-   Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_param_spec_pool_new
    fun:g_object_do_class_init
-   fun:g_type_class_ref
 }
 {
    glib/typeref7
@@ -438,25 +502,39 @@
    fun:g_type_class_ref
 }
 {
-   glib/langnames1
+   glib/typeref11
+   Memcheck:Leak
+   fun:malloc
+   fun:realloc
+   fun:g_realloc
+   fun:g_type_add_interface_check
+}
+{
+   glib/typeref12
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
-   fun:g_strdup
-   fun:g_get_language_names
-   fun:main
+   fun:g_slice_alloc
+   fun:g_slist_copy
+   fun:g_object_base_class_init
+   fun:type_class_init_Wm
+   fun:g_type_class_ref
 }
 {
-   glib/langnames2
+   glib/langnames1
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_resize
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:read_aliases
+   fun:unalias_lang
    fun:g_get_language_names
-   fun:main
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
-   glib/langnames3
+   glib/langnames2
    Memcheck:Leak
    fun:realloc
    fun:g_realloc
@@ -464,7 +542,21 @@
    fun:g_array_set_size
    fun:g_static_private_set
    fun:g_get_language_names
-   fun:main
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
+}
+{
+   glib/langnames3
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_strconcat
+   fun:_g_compute_locale_variants
+   fun:g_get_language_names
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
    glib/langnames4
@@ -472,17 +564,20 @@
    fun:malloc
    fun:g_malloc
    fun:g_get_language_names
-   fun:main
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
    glib/langnames5
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
-   fun:g_strconcat
-   fun:_g_compute_locale_variants
+   fun:g_strdup
    fun:g_get_language_names
-   fun:main
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
    glib/langnames6
@@ -490,31 +585,51 @@
    fun:calloc
    fun:g_malloc0
    fun:g_get_language_names
-   fun:main
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
-   glib/intern1
+   glib/langnames7
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_strdup
-   fun:g_intern_string
+   fun:g_get_language_names
+   fun:_g_utils_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
-   glib/intern2
+   glib/charsets
    Memcheck:Leak
    fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_intern_string
+   fun:g_malloc
+   fun:g_slice_alloc
+   fun:g_array_sized_new
+   fun:g_array_new
+   fun:g_static_private_set
+   fun:g_get_filename_charsets
+   fun:_g_convert_thread_init
+   fun:g_thread_init_glib
+   fun:g_thread_init
 }
 {
-   glib/intern3
+   glib/prgname
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_hash_table_resize
-   fun:g_intern_static_string
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:g_set_prgname
+}
+{
+   glib/intern
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_strdup
+   fun:g_quark_from_string_internal
+   fun:g_intern_string
 }
 {
    glib/gthreadinit1
@@ -683,6 +798,25 @@
    fun:g_hash_table_new_full
    fun:g_data_initialize
 }
+{
+   glib/childwatch1
+   Memcheck:Leak
+   fun:calloc
+   fun:g_malloc0
+   fun:g_thread_create_full
+   fun:g_child_watch_source_init_multi_threaded
+}
+{
+   glib/childwatch2
+   Memcheck:Leak
+   fun:calloc
+   fun:_dl_allocate_tls
+   fun:pthread_create@@GLIBC_2.1
+   fun:g_thread_create_posix_impl
+   fun:g_thread_create_full
+   fun:g_child_watch_source_init_multi_threaded
+   fun:g_child_watch_source_init
+}
 
 
 {
@@ -703,6 +837,7 @@
    Memcheck:Leak
    fun:malloc
    fun:xmlStrndup
+   fun:xmlStrdup
    fun:xmlNewCharEncodingHandler
    fun:xmlInitCharEncodingHandlers
 }
@@ -727,32 +862,40 @@
    fun:xmlNewMutex
    fun:xmlInitMemory
 }
+{
+   libxml2/parse
+   Memcheck:Leak
+   fun:malloc
+   fun:xmlNewRMutex
+   obj:/usr/lib/libxml2.so.2.6.31
+   fun:xmlDictCreate
+   fun:xmlInitParserCtxt
+}
 
 {
    gnutls/init1
    Memcheck:Leak
-   fun:malloc
-   fun:gcry_pthread_mutex_init
-   fun:initialize_basics
-   fun:gcry_control
+   fun:calloc
+   fun:_asn1_add_node
+   fun:asn1_array2tree
    fun:gnutls_global_init
 }
 {
    gnutls/init2
    Memcheck:Leak
-   fun:malloc
-   fun:gcry_pthread_mutex_init
-   fun:initialize_basics
-   fun:gcry_control
+   fun:calloc
+   fun:_asn1_add_node_only
+   fun:_asn1_expand_object_id
+   fun:asn1_array2tree
    fun:gnutls_global_init
 }
 {
    gnutls/init3
    Memcheck:Leak
    fun:malloc
-   fun:gcry_pthread_mutex_init
-   fun:global_init
-   fun:gcry_check_version
+   fun:strdup
+   fun:_asn1_set_name
+   fun:asn1_array2tree
    fun:gnutls_global_init
 }
 {
@@ -767,21 +910,23 @@
    gnutls/init5
    Memcheck:Leak
    fun:malloc
-   fun:gcry_pthread_mutex_init
-   fun:mutex_init
-   fun:_gcry_ath_mutex_lock
-   fun:_gcry_cipher_init
-   fun:global_init
-   fun:gcry_check_version
+   fun:strdup
+   fun:_asn1_set_name
+   fun:_asn1_expand_object_id
+   fun:asn1_array2tree
    fun:gnutls_global_init
 }
 {
    gnutls/init6
    Memcheck:Leak
    fun:malloc
-   fun:_asn1_set_value
-   fun:_asn1_change_integer_value
-   fun:asn1_array2tree
+   fun:_gcry_malloc
+   fun:gcry_malloc
+   fun:gcry_xmalloc
+   fun:gcry_xcalloc
+   fun:initialize
+   fun:gcry_randomize
+   fun:gc_pseudo_random
    fun:gnutls_global_init
 }
 {
@@ -797,6 +942,7 @@
    gnutls/init8
    Memcheck:Leak
    fun:malloc
+   fun:_gcry_private_malloc
    fun:_gcry_malloc
    fun:gcry_malloc
    fun:_gcry_module_add
@@ -810,75 +956,59 @@
    gnutls/init9
    Memcheck:Leak
    fun:malloc
-   fun:_gcry_malloc
-   fun:gcry_malloc
-   fun:gcry_xmalloc
-   fun:gcry_xcalloc
-   fun:initialize
-   fun:gcry_randomize
-   fun:gc_pseudo_random
+   fun:_asn1_set_value
+   fun:_asn1_change_integer_value
+   fun:asn1_array2tree
    fun:gnutls_global_init
 }
 {
    gnutls/init10
    Memcheck:Leak
-   fun:calloc
-   fun:_asn1_add_node
-   fun:asn1_array2tree
-   fun:gnutls_global_init
+   fun:malloc
+   fun:gcry_pthread_mutex_init
+   fun:mutex_init
+   fun:_gcry_ath_mutex_lock
+   fun:_gcry_cipher_init
+   fun:global_init
 }
 {
    gnutls/init11
    Memcheck:Leak
    fun:malloc
-   fun:strdup
-   fun:_asn1_set_name
-   fun:_asn1_expand_object_id
-   fun:asn1_array2tree
+   fun:gcry_pthread_mutex_init
+   fun:_gcry_ath_init
+   fun:global_init
+   fun:gcry_check_version
    fun:gnutls_global_init
 }
 {
    gnutls/init12
    Memcheck:Leak
    fun:malloc
-   fun:_asn1_set_value
-   fun:asn1_array2tree
+   fun:gcry_pthread_mutex_init
+   fun:mutex_init
+   fun:initialize_basics
+   fun:gcry_control
    fun:gnutls_global_init
 }
 {
    gnutls/init13
    Memcheck:Leak
    fun:malloc
-   fun:strdup
-   fun:_asn1_set_name
-   fun:asn1_array2tree
-   fun:gnutls_global_init
-}
-{
-   gnutls/init14
-   Memcheck:Leak
-   fun:calloc
-   fun:_asn1_add_node_only
-   fun:_asn1_expand_object_id
-   fun:asn1_array2tree
-   fun:gnutls_global_init
-}
-{
-   gnutls/init15
-   Memcheck:Leak
-   fun:calloc
-   fun:_asn1_add_node
-   fun:asn1_array2tree
+   fun:gcry_pthread_mutex_init
+   fun:mutex_init
+   fun:initialize_basics
+   fun:gcry_control
    fun:gnutls_global_init
 }
 
-
 {
    libsoup/headers
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
-   fun:g_hash_table_new_full
+   fun:g_strdup
+   fun:intern_header_locked
    fun:intern_header_name
 }
 {

diff --git a/tests/uri-parsing.c b/tests/uri-parsing.c
index cbafc53..c189823 100644 (file)
--- a/tests/uri-parsing.c
+++ b/tests/uri-parsing.c
@@ -228,6 +228,8 @@ main (int argc, char **argv)
                                      uri2->scheme, uri2->host, uri2->path);
                        errors++;
                }
+               soup_uri_free (uri1);
+               soup_uri_free (uri2);
        }
 
        test_cleanup ();