From dc3ddc18d3b08e5dd36cf96d469d6ab355896abd Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 16 Nov 2015 11:45:50 +0000 Subject: [PATCH] libdfu: Fix a crash when setting a NULL image name --- libdfu/dfu-image.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libdfu/dfu-image.c b/libdfu/dfu-image.c index 2aedbd52d..da0d85255 100644 --- a/libdfu/dfu-image.c +++ b/libdfu/dfu-image.c @@ -261,9 +261,11 @@ dfu_image_set_name (DfuImage *image, const gchar *name) g_return_if_fail (DFU_IS_IMAGE (image)); /* this is a hard limit in DfuSe */ - sz = MIN (strlen (name), 254); - memset (priv->name, 0x00, 254); - memcpy (priv->name, name, sz); + memset (priv->name, 0x00, 0xff); + if (name != NULL) { + sz = MIN (strlen (name), 0xff - 1); + memcpy (priv->name, name, sz); + } } /**