commit d77ee5d07cc196b753d506fe624d6598e3740cd8
author Prasanta Sadhukhan <psadhukhan@openjdk.org> Mon Aug 20 11:35:48 2018 +0530
committer Prasanta Sadhukhan <psadhukhan@openjdk.org> Mon Aug 20 11:35:48 2018 +0530
tree ce81b96d591c49e8c0af636a2241c4ceb41cba7b
parent 9783c9d4e33a9085dd251d0581b0aaf860cd77e1

8205356: Choose printer defaults

Reviewed-by: prr, mschoene, rhalade

src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp

diff --git a/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp b/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
index 058c0db..b85ddf4 100644
--- a/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
@@ -962,9 +962,10 @@
               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