Changeset 286

Timestamp:

Apr 23, 2011, 12:54:45 AM (14 years ago)

Author:

dmik

Message:

jdk: Fixed a crash when showing the print dialog in many applications due to jsafe_cast not really expecting non-POD objects with default copy ctors.

Location:

trunk/openjdk/jdk/src/windows

Files:

• javavm/export/jni_md.h (modified) (1 diff)
• native/sun/windows/awt_PrintControl.cpp (modified) (1 diff)

trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h

@@ -41 +41 @@
 #ifdef __cplusplus
 
+inline void jsafe_cast_POD_type_only(...) {}
+
 /* template for safe type casting: the generic version lets the compiler
  * decide (as if no template was used); specific instantiations deal with
- * special cases which are guaranteed to be safe */
+ * special cases which are guaranteed to be safe. Note that it cannot be used
+ * with non-POD types as otherwise it would implicitly call the copy ctor which
+ * may have various unwanted side effects */
 template<typename TR, typename TS>
-inline TR jsafe_cast(TS ts) { return ts; }
+inline TR jsafe_cast(TS ts) { jsafe_cast_POD_type_only(ts); return ts; }
 
 #ifdef __EMX__

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp

@@ -136 +136 @@
 
     JavaStringBuffer printerNameBuf(env, printerName);
-    LPTSTR lpcPrinterName = jsafe_cast<LPTSTR>(printerNameBuf);
+    LPTSTR lpcPrinterName = printerNameBuf;
     DASSERT(lpcPrinterName != NULL);