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

Unified Diff: base/sys_string_conversions_mac.mm

Issue 371057: Fix NSString conversions to treat a null NSString as a string of length 0, in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | « base/sys_string_conversions.h ('k') | base/sys_string_conversions_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/sys_string_conversions_mac.mm
===================================================================
--- base/sys_string_conversions_mac.mm (revision 31117)
+++ base/sys_string_conversions_mac.mm (working copy)
@@ -184,14 +184,20 @@
}
std::string SysNSStringToUTF8(NSString* nsstring) {
+ if (!nsstring)
+ return std::string();
return SysCFStringRefToUTF8(reinterpret_cast<CFStringRef>(nsstring));
}
string16 SysNSStringToUTF16(NSString* nsstring) {
+ if (!nsstring)
+ return string16();
return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring));
}
std::wstring SysNSStringToWide(NSString* nsstring) {
+ if (!nsstring)
+ return std::wstring();
return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring));
}
« no previous file with comments | « base/sys_string_conversions.h ('k') | base/sys_string_conversions_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698