| From 305233bca0cd340737b06918c9be1a37c088b936 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com> |
| Date: Thu, 6 Dec 2012 21:00:40 +0000 |
| Subject: [PATCH] Fix to avoid a nih_assert(var != NULL) on empty null |
| terminated arrays. |
| |
| --- |
| nih-dbus-tool/type.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/nih-dbus-tool/type.c b/nih-dbus-tool/type.c |
| index 392635a..f54fb25 100644 |
| --- a/nih-dbus-tool/type.c |
| +++ b/nih-dbus-tool/type.c |
| @@ -1101,7 +1101,7 @@ type_strcat_assert (char ** block, |
| nih_assert (block != NULL); |
| nih_assert (var != NULL); |
| |
| - if (! strchr (var->type, '*')) |
| + if (! strchr (var->type, '*') || ! strcmp (var->type, "char * const *")) |
| return *block; |
| |
| if (next && (! strcmp (next->type, "size_t"))) { |
| -- |
| 2.36.1.476.g0c4daa206d-goog |
| |
