Commit FS#9102 thanks to Martin Pahl

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18154 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 1 deletions

diff --git a/docs/CREDITS b/docs/CREDITS
index 8afe5549af..9ee7898c07 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -401,6 +401,7 @@ Thibaut Girka
 Rasmus Ry
 William Poetra Yoga Hadisoeseno
 Adrian Osoianu
+Martin Pahl
 
 The libmad team
 The wavpack team
diff --git a/utils/disassembler/arm/disasm_arm.c b/utils/disassembler/arm/disasm_arm.c
index aa04ab6265..b23c6b0355 100644
--- a/utils/disassembler/arm/disasm_arm.c
+++ b/utils/disassembler/arm/disasm_arm.c
@@ -364,7 +364,10 @@ void block_data(char *stg, ULONG val)
   for(i=0; i<16; i++)

     if(val & (1<<i))

       sprintf(lst+strlen(lst), "%s, ", regs[i]);

-  strcpy(lst+strlen(lst)-2, "}");

+  if(strlen(lst)>2)

+    strcpy(lst+strlen(lst)-2, "}");

+  else

+    strcpy(lst+strlen(lst), "}");

 

   if(val & 0x400000) // load psr or force user mode

   strcpy(lst+strlen(lst), "^");