Bug#312120: xpm2wico: SIGSEGV on amd64

[Steve Langasek]

Hi Wolfgang,

Since Ben's patch looks correct to me, I'm going to go ahead and upload a
0-day NMU using it.  The final diff for the NMU is attached; will be
uploaded to unstable shortly.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/

diff -u xpm2wico-0.2.4.3/debian/changelog xpm2wico-0.2.4.3/debian/changelog
--- xpm2wico-0.2.4.3/debian/changelog
+++ xpm2wico-0.2.4.3/debian/changelog
@@ -1,3 +1,12 @@
+xpm2wico (0.2.4.3-1.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Fix 64-bit issues affecting ia64 and amd64; thanks to Ben Hutchings
+    <[EMAIL PROTECTED]> for the patch.  Closes: #312120.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Wed, 15 Feb 2006 02:38:28 -0800
+
 xpm2wico (0.2.4.3-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- xpm2wico-0.2.4.3.orig/src/xpm2wico.c
+++ xpm2wico-0.2.4.3/src/xpm2wico.c
@@ -961,10 +961,10 @@
   last_slash_ptr = strrchr (file_name, '/');
 #endif
 
-  if ((DWord) last_slash_ptr < (DWord) char_ptr)
+  if (last_slash_ptr < char_ptr)
     {
       ext = 1;
-      delta = ((DWord) char_ptr - (DWord) file_name);
+      delta = char_ptr - file_name;
       nlen = delta + 5;
     }
   else
only in patch2:
unchanged:
--- xpm2wico-0.2.4.3.orig/src/readicon.c
+++ xpm2wico-0.2.4.3/src/readicon.c
@@ -30,11 +30,11 @@
   printf ("reserved = %x\n"
          "type = %x\n"
          "count = %x\n"
-         "entries = %x\n\n",
+         "entries = %p\n\n",
          icon_dir->idReserved,
          icon_dir->idType,
          icon_dir->idCount,
-         (int) icon_dir->idEntries);
+         icon_dir->idEntries);
 }
 
 void print_icon_dir_entry (IconDirEntry *icon_dir_entry)
only in patch2:
unchanged:
--- xpm2wico-0.2.4.3.orig/src/winutils.h
+++ xpm2wico-0.2.4.3/src/winutils.h
@@ -26,13 +26,9 @@
 typedef unsigned char Byte;
 typedef unsigned short Word;
 
-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
 typedef unsigned int DWord;
+/* Windows "long" is always a 32-bit signed integer */
 typedef int Long;
-#else
-typedef unsigned long DWord;
-typedef long Long;
-#endif
 
 /* Those functions read byte,word,dword,long in little-endian mode */
 Byte read_byte (FILE *file);

signature.asc
Description: Digital signature