bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-03 21:51:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add checks to CefStringBase constructors for NULL pointers (issue #671).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@732 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-08-07 17:05:24 +00:00
parent 3b8ebef27b
commit b6720c17e0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cef1/include/internal/cef_string_wrappers.h
View File

@ -314,6 +314,7 @@ class CefStringBase {
} }
CefStringBase(const char* src) // NOLINT(runtime/explicit) CefStringBase(const char* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) { : string_(NULL), owner_(false) {
if (src)
FromString(std::string(src)); FromString(std::string(src));
} }
@ -328,6 +329,7 @@ class CefStringBase {
} }
CefStringBase(const wchar_t* src) // NOLINT(runtime/explicit) CefStringBase(const wchar_t* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) { : string_(NULL), owner_(false) {
if (src)
FromWString(std::wstring(src)); FromWString(std::wstring(src));
} }
@ -343,6 +345,7 @@ class CefStringBase {
} }
CefStringBase(const char16* src) // NOLINT(runtime/explicit) CefStringBase(const char16* src) // NOLINT(runtime/explicit)
: string_(NULL), owner_(false) { : string_(NULL), owner_(false) {
if (src)
FromString16(string16(src)); FromString16(string16(src));
} }
#endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 #endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32
@ -355,6 +358,7 @@ class CefStringBase {
/// ///
CefStringBase(const char_type* src, size_t src_len, bool copy) CefStringBase(const char_type* src, size_t src_len, bool copy)
: string_(NULL), owner_(false) { : string_(NULL), owner_(false) {
if (src && src_len > 0)
FromString(src, src_len, copy); FromString(src, src_len, copy);
} }