Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: printing/backend/win_helper.cc

Issue 172813003: Added NULL pointer check for DEVMODE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/win_helper.cc
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index cfc1a5821528db9ee598049526b97291663f68e8..a16228b703da699259bc962c1069665487632c6c 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -431,7 +431,10 @@ scoped_ptr<DEVMODE[]> CreateDevModeWithColor(HANDLE printer,
const base::string16& printer_name,
bool color) {
scoped_ptr<DEVMODE[]> default = CreateDevMode(printer, NULL);
- if (default && (default.get()->dmFields & DM_COLOR) &&
+ if (!default)
+ return default.Pass();
+
+ if ((default.get()->dmFields & DM_COLOR) &&
((default.get()->dmColor == DMCOLOR_COLOR) == color)) {
return default.Pass();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698