Attachment 115232 Details for Bug 90118 – Avoid crash during the log

[patch] Avoid crash during the log

0001-Avoid-crash-if-the-g_variant_new_string-fails.patch (text/plain), 1.42 KB, created by renato filho on 2015-04-20 17:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: renato filho

Created: 2015-04-20 17:57:43 UTC

Size: 1.42 KB

patch

obsolete

>From f119970cc3cfe386b10f507f92c9a99436cf06c1 Mon Sep 17 00:00:00 2001
>From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
>Date: Mon, 20 Apr 2015 14:03:17 -0300
>Subject: [PATCH] Avoid crash if the 'g_variant_new_string' fails.
>
>---
> src/gdbusxx/gdbus-cxx-bridge.h | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/src/gdbusxx/gdbus-cxx-bridge.h b/src/gdbusxx/gdbus-cxx-bridge.h
>index 9b78023..fddf83b 100644
>--- a/src/gdbusxx/gdbus-cxx-bridge.h
>+++ b/src/gdbusxx/gdbus-cxx-bridge.h
>@@ -1507,7 +1507,10 @@ template<> struct dbus_traits<std::string> : public dbus_traits_base
> 
>     static void append(GVariantBuilder &builder, const std::string &value)
>     {
>-        g_variant_builder_add_value(&builder, g_variant_new_string(value.c_str()));
>+        GVariant *var = g_variant_new_string(value.c_str());
>+        if (var) {
>+            g_variant_builder_add_value(&builder, var);
>+        }
>     }
> 
>     typedef std::string host_type;
>@@ -1524,7 +1527,10 @@ template<> struct dbus_traits<const char *> : public dbus_traits_base
> 
>     static void append(GVariantBuilder &builder, const char *value)
>     {
>-        g_variant_builder_add_value(&builder, g_variant_new_string(value ? value : ""));
>+        GVariant *var = g_variant_new_string(value ? value : "");
>+        if (var) {
>+            g_variant_builder_add_value(&builder, var);
>+        }
>     }
> 
>     typedef const char *host_type;
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 90118: 115231 | 115232 | 116196

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.