Merge pull request tojocky#254 from george-g/master

Fix tojocky#216 printer.getPrinters() is not fail-safe
ekoeryanto · Jun 24, 2019 · c35bc17 · c35bc17
2 parents dff584d + 7b77c5b
commit c35bc17
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/node_printer_win.cc b/src/node_printer_win.cc
@@ -317,15 +317,21 @@ namespace{
         {
             std::string error_str("Error on allocating memory for jobs: ");
             error_str += getLastErrorCodeAndMessage();
-            return error_str;
+            v8::Local<v8::Object> result_printer_job = V8_VALUE_NEW_DEFAULT_V_0_11_10(Object);
+            result_printer_job->Set(V8_STRING_NEW_UTF8("error"), V8_STRING_NEW_UTF8(error_str.c_str()));
+            result_printer_jobs->Set(0, result_printer_job);
+            return std::string("");
         }
         DWORD dummy_bytes = 0;
         bError = EnumJobsW(*iPrinterHandle, 0, iTotalJobs, 2, (LPBYTE)jobs.get(), bytes_needed, &dummy_bytes, &totalJobs);
         if(!bError)
         {
             std::string error_str("Error on EnumJobsW: ");
             error_str += getLastErrorCodeAndMessage();
-            return error_str;
+            v8::Local<v8::Object> result_printer_job = V8_VALUE_NEW_DEFAULT_V_0_11_10(Object);
+            result_printer_job->Set(V8_STRING_NEW_UTF8("error"), V8_STRING_NEW_UTF8(error_str.c_str()));
+            result_printer_jobs->Set(0, result_printer_job);
+            return std::string("");
         }
         JOB_INFO_2W *job = jobs.get();
         for(DWORD i = 0; i < totalJobs; ++i, ++job)