Fix undefined behaviour in -g (Debian ticket #688460)

Thanks to Michael Tautschnig for reporting the bug.

diff --git a/HISTORY b/HISTORY
index 7b8b5cc478d2190edeaa301fcca3fb0f44861cf6..ac954c55b8ff677173d9653aff136102dcd1701b 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 This is the long-form history of the project.  For the short form used
 to generate release announcements, see NEWS.
 
+== Release ?.?? (currently unreleased) ==
+
+1.  Some potential undefined behaviour (which happens to do the right
+    thing on every compiler tested) related to the -g option has been
+    fixed. (Thanks to Michael Tautschnig for reporting the bug.)
+
 == Release 0.29 (by Alex Smith, Eric S. Raymond) 29 Nov 2010 ==
 
 === Changes by Eric S. Raymond ===

diff --git a/src/feh2.c b/src/feh2.c
index 3eb714841acf856c227591bee574e4181c07703f..dead0dfe07e101d5d8a3d84ba2ec6c22b39e233b 100644 (file)
--- a/src/feh2.c
+++ b/src/feh2.c
@@ -1802,7 +1802,7 @@ void emit(tuple *tn, FILE *fp)
     int        dim;
     int generatecfjump=0; /* AIS */
     static int pasttryagain=0; /* AIS */
-    extern int cdebug;
+    extern bool cdebug; /* AIS */
 
     /* grind out label and source dump */
     if (yydebug || cdebug || compile_only)