Prepare release.

.hgtags

@@ -7,6 +7,7 @@
 396983c065fc743cb5b9703e266ca87eeff8a6ee RELEASE_291
 46f3a6cca02603000fadc16637b02e30caddd909 RELEASE_302
 70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
+7c6747c82b167368344a238b1a3a87c2a4fa6a18 RELEASE_306
 95c558f81a0b8d5bb2bede4c8208bb84ae7d1e58 RELEASE_303
 a1c61174f54aac714f59ac20fcba839d71e64c5c RELEASE_292
 a916a2fe22de45167d25abcb40008315f415221c RELEASE_201

NEWS

@@ -2,6 +2,10 @@
 User visible changes for UPX
 ==================================================================
 
+Changes in 3.07 (08 Sep 2010):
+  * win32/pe: fixed relocation handling for files with *no* TLS callbacks
+    [severe bug introduced in 3.06]
+
 Changes in 3.06 (04 Sep 2010):
   * win32/pe: TLS callback support contributed by Stefan Widmann. Thanks!
   * bug fixes

src/p_w32pe.cpp

@@ -1180,9 +1180,12 @@ void PackW32Pe::pack(OutputFile *fo)
 
     //ic = s1addr + s1size - sotls - soloadconf;  //ATTENTION: moved upwards to TLS callback handling - Stefan Widmann
     //get address of TLS callback handler
-    tls_handler_offset = linker->getSymbolOffset("PETLSC2");
-    //add relocation entry for TLS callback handler
-    rel.add(tls_handler_offset + 4, 3);
+    if (use_tls_callbacks)
+    {
+        tls_handler_offset = linker->getSymbolOffset("PETLSC2");
+        //add relocation entry for TLS callback handler
+        rel.add(tls_handler_offset + 4, 3);
+    }
 
     processTls(&rel,&tlsiv,ic);
     ODADDR(PEDIR_TLS) = sotls ? ic : 0;

src/version.h

@@ -1,6 +1,6 @@
-#define UPX_VERSION_HEX         0x030600        /* 03.06.00 */
-#define UPX_VERSION_STRING      "3.06"
-#define UPX_VERSION_STRING4     "3.06"
-#define UPX_VERSION_DATE        "Sep 04th 2010"
-#define UPX_VERSION_DATE_ISO    "2010-09-04"
+#define UPX_VERSION_HEX         0x030700        /* 03.07.00 */
+#define UPX_VERSION_STRING      "3.07"
+#define UPX_VERSION_STRING4     "3.07"
+#define UPX_VERSION_DATE        "Sep 08th 2010"
+#define UPX_VERSION_DATE_ISO    "2010-09-08"
 #define UPX_VERSION_YEAR        "2010"