87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
|
From d72956a6de228c91d1fc48fd15448fadea9ab6cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frank Richter <frank.richter@gmail.com>
|
||
|
|
Date: Sat, 10 Mar 2018 14:08:37 +0100
|
||
|
|
Subject: [PATCH] wrestool: Fix get_resource_id_quoted() to return
|
||
|
|
heap-allocated string
|
||
|
|
|
||
|
|
---
|
||
|
|
NEWS | 4 ++++
|
||
|
|
wrestool/restable.c | 21 +++++++++++++--------
|
||
|
|
2 files changed, 17 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/NEWS b/NEWS
|
||
|
|
index 414bec4..086f8dc 100644
|
||
|
|
--- a/NEWS
|
||
|
|
+++ b/NEWS
|
||
|
|
@@ -1,3 +1,7 @@
|
||
|
|
+2018-??-??:
|
||
|
|
+ wrestool: Fix get_resource_id_quoted() to return heap-allocated string.
|
||
|
|
+ Found by Jonathan Liu.
|
||
|
|
+
|
||
|
|
2018-03-07: icoutils 0.32.3 released.
|
||
|
|
Fixed a segfault. (Martin Gieseking, Savannah bug 52319)
|
||
|
|
Updated Gnulib stuff.
|
||
|
|
diff --git a/wrestool/restable.c b/wrestool/restable.c
|
||
|
|
index 0d47d94..4d99687 100644
|
||
|
|
--- a/wrestool/restable.c
|
||
|
|
+++ b/wrestool/restable.c
|
||
|
|
@@ -23,6 +23,7 @@
|
||
|
|
#define N_(s) gettext_noop(s)
|
||
|
|
#include "common/intutil.h"
|
||
|
|
#include "xalloc.h" /* Gnulib */
|
||
|
|
+#include "xvasprintf.h" /* Gnulib */
|
||
|
|
#include "minmax.h" /* Gnulib */
|
||
|
|
#include "common/error.h"
|
||
|
|
#include "wrestool.h"
|
||
|
|
@@ -125,6 +126,7 @@ print_resources_callback (WinLibrary *fi, WinResource *wr,
|
||
|
|
const char *type, *offset;
|
||
|
|
int32_t id;
|
||
|
|
size_t size;
|
||
|
|
+ char *type_quoted, *name_quoted, *lang_quoted;
|
||
|
|
|
||
|
|
/* get named resource type if possible */
|
||
|
|
type = NULL;
|
||
|
|
@@ -136,28 +138,31 @@ print_resources_callback (WinLibrary *fi, WinResource *wr,
|
||
|
|
if (offset == NULL)
|
||
|
|
return;
|
||
|
|
|
||
|
|
+ type_quoted = get_resource_id_quoted(type_wr);
|
||
|
|
+ name_quoted = get_resource_id_quoted(name_wr);
|
||
|
|
+ lang_quoted = get_resource_id_quoted(lang_wr);
|
||
|
|
printf(_("--type=%s --name=%s%s%s [%s%s%soffset=0x%x size=%zu]\n"),
|
||
|
|
- get_resource_id_quoted(type_wr),
|
||
|
|
- get_resource_id_quoted(name_wr),
|
||
|
|
+ type_quoted,
|
||
|
|
+ name_quoted,
|
||
|
|
(lang_wr->id[0] != '\0' ? _(" --language=") : ""),
|
||
|
|
- get_resource_id_quoted(lang_wr),
|
||
|
|
+ lang_quoted,
|
||
|
|
(type != NULL ? "type=" : ""),
|
||
|
|
(type != NULL ? type : ""),
|
||
|
|
(type != NULL ? " " : ""),
|
||
|
|
(uint32_t) (offset - fi->memory), size);
|
||
|
|
+ free(type_quoted);
|
||
|
|
+ free(name_quoted);
|
||
|
|
+ free(lang_quoted);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* return the resource id quoted if it's a string, otherwise just return it */
|
||
|
|
static char *
|
||
|
|
get_resource_id_quoted (WinResource *wr)
|
||
|
|
{
|
||
|
|
- static char tmp[WINRES_ID_MAXLEN+2];
|
||
|
|
-
|
||
|
|
if (wr->numeric_id || wr->id[0] == '\0')
|
||
|
|
- return wr->id;
|
||
|
|
+ return xstrdup(wr->id);
|
||
|
|
|
||
|
|
- sprintf(tmp, "'%s'", wr->id);
|
||
|
|
- return tmp;
|
||
|
|
+ return xasprintf("'%s'", wr->id);
|
||
|
|
}
|
||
|
|
|
||
|
|
static bool
|
||
|
|
--
|
||
|
|
2.13.2
|
||
|
|
|