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

Add additional error checking for CefV8Value methods (issue #427).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@381 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-11-16 22:12:54 +00:00
parent 0f10560d27
commit 268675fdbe
3 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libcef_dll/cpptoc/v8value_cpptoc.cc
View File

@ -286,7 +286,8 @@ int CEF_CALLBACK v8value_has_value_bykey(struct _cef_v8value_t* self,
const cef_string_t* key)
{
DCHECK(self);
if(!self)
DCHECK(key);
if(!self || !key)
return 0;
return CefV8ValueCppToC::Get(self)->HasValue(CefString(key));
@ -296,7 +297,8 @@ int CEF_CALLBACK v8value_has_value_byindex(struct _cef_v8value_t* self,
int index)
{
DCHECK(self);
if(!self)
DCHECK(index >= 0);
if(!self || index < 0)
return 0;
return CefV8ValueCppToC::Get(self)->HasValue(index);
@ -306,7 +308,8 @@ int CEF_CALLBACK v8value_delete_value_bykey(struct _cef_v8value_t* self,
const cef_string_t* key)
{
DCHECK(self);
if(!self)
DCHECK(key);
if(!self || !key)
return 0;
return CefV8ValueCppToC::Get(self)->DeleteValue(CefString(key));
@ -316,7 +319,8 @@ int CEF_CALLBACK v8value_delete_value_byindex(struct _cef_v8value_t* self,
int index)
{
DCHECK(self);
if(!self)
DCHECK(index >= 0);
if(!self || index < 0)
return 0;
return CefV8ValueCppToC::Get(self)->DeleteValue(index);
@ -326,7 +330,8 @@ struct _cef_v8value_t* CEF_CALLBACK v8value_get_value_bykey(
struct _cef_v8value_t* self, const cef_string_t* key)
{
DCHECK(self);
if(!self)
DCHECK(key);
if(!self || !key)
return 0;
CefRefPtr<CefV8Value> valuePtr =
@ -338,7 +343,8 @@ struct _cef_v8value_t* CEF_CALLBACK v8value_get_value_byindex(
struct _cef_v8value_t* self, int index)
{
DCHECK(self);
if(!self)
DCHECK(index >= 0);
if(!self || index < 0)
return 0;
CefRefPtr<CefV8Value> valuePtr =
@ -351,7 +357,9 @@ int CEF_CALLBACK v8value_set_value_bykey(struct _cef_v8value_t* self,
enum cef_v8_propertyattribute_t attribute)
{
DCHECK(self);
if(!self)
DCHECK(key);
DCHECK(value);
if(!self || !key || !value)
return 0;
CefRefPtr<CefV8Value> valuePtr = CefV8ValueCppToC::Unwrap(value);
@ -363,7 +371,9 @@ int CEF_CALLBACK v8value_set_value_byindex(struct _cef_v8value_t* self,
int index, struct _cef_v8value_t* value)
{
DCHECK(self);
if(!self)
DCHECK(index >= 0);
DCHECK(value);
if(!self || index < 0 || !value)
return 0;
CefRefPtr<CefV8Value> valuePtr = CefV8ValueCppToC::Unwrap(value);
@ -375,7 +385,8 @@ int CEF_CALLBACK v8value_set_value_byaccessor(struct _cef_v8value_t* self,
enum cef_v8_propertyattribute_t attribute)
{
DCHECK(self);
if(!self)
DCHECK(key);
if(!self || !key)
return 0;
return CefV8ValueCppToC::Get(self)->SetValue(CefString(key),
@ -386,7 +397,8 @@ int CEF_CALLBACK v8value_get_keys(struct _cef_v8value_t* self,
cef_string_list_t keys)
{
DCHECK(self);
if(!self)
DCHECK(keys);
if(!self || !keys)
return 0;
std::vector<CefString> keysList;