[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom v3 04/14] qmp: qstring: Handle NULL strings
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH qom v3 04/14] qmp: qstring: Handle NULL strings |
Date: |
Thu, 25 Sep 2014 22:18:47 -0700 |
Create a valid qobject even if the input string is null.
qstring->string will be NULL and length will be 0.
This prepares support for clearing of QOM Link properties
where NULL canonical path string will be passes through
this API.
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
qobject/qstring.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/qobject/qstring.c b/qobject/qstring.c
index 607b7a1..a15ffed 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -48,14 +48,16 @@ QString *qstring_from_substr(const char *str, int start,
int end)
{
QString *qstring;
- qstring = g_malloc(sizeof(*qstring));
+ qstring = g_malloc0(sizeof(*qstring));
qstring->length = end - start + 1;
qstring->capacity = qstring->length;
- qstring->string = g_malloc(qstring->capacity + 1);
- memcpy(qstring->string, str + start, qstring->length);
- qstring->string[qstring->length] = 0;
+ if (str) {
+ qstring->string = g_malloc(qstring->capacity + 1);
+ memcpy(qstring->string, str + start, qstring->length);
+ qstring->string[qstring->length] = 0;
+ }
QOBJECT_INIT(qstring, &qstring_type);
@@ -69,7 +71,7 @@ QString *qstring_from_substr(const char *str, int start, int
end)
*/
QString *qstring_from_str(const char *str)
{
- return qstring_from_substr(str, 0, strlen(str) - 1);
+ return qstring_from_substr(str, 0, (str ? strlen(str) : 0) - 1);
}
static void capacity_increase(QString *qstring, size_t len)
--
2.1.0.1.g27b9230
- [Qemu-devel] [PATCH qom v3 00/14] GPIO/IRQ QOMification: Phase 2 - Getting rid of SYSBUS IRQs, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 01/14] qdev: gpio: Don't allow name share between I and O, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 02/14] qdev: gpio: Register GPIO inputs as child objects, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 03/14] qdev: gpio: Register GPIO outputs as QOM links, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 04/14] qmp: qstring: Handle NULL strings,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH qom v3 05/14] qom: Allow clearing of a Link property, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 06/14] qom: Demote already-has-a-parent to a regular error, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 07/14] qdev: gpio: Re-impement qdev_connect_gpio QOM style, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 08/14] qdev: gpio: Add API for intercepting a GPIO, Peter Crosthwaite, 2014/09/26
- [Qemu-devel] [PATCH qom v3 09/14] qtest/irq: Rework IRQ interception, Peter Crosthwaite, 2014/09/26