8205356: Choose printer defaults

Reviewed-by: prr, mschoene, rhalade

8205356: Choose printer defaults
Reviewed-by: prr, mschoene, rhalade
a6b361f9 · psadhukhan · 005e0e17 · a6b361f9
隐藏空白更改
内联并排

Showing with 5 addition and 3 deletion

src/windows/native/sun/windows/WPrinterJob.cpp src/windows/native/sun/windows/WPrinterJob.cpp +5 -3

未找到文件。
--- a/src/windows/native/sun/windows/WPrinterJob.cpp
+++ b/src/windows/native/sun/windows/WPrinterJob.cpp
@@ -886,10 +886,12 @@ Java_sun_print_Win32PrintService_getDefaultSettings(JNIEnv *env,
              if (!present) {
                  defIndices[0] = papers[0];
              }
-              if (papers != NULL) {
-                  free((char*)papers);
-              }
          }
+          // If DeviceCapabilities fails, then also free paper allocation
+          if (papers != NULL) {
+              free((char*)papers);
+          }
+
      }
      RESTORE_CONTROLWORD
  }