| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index d2d7de38ccf50dff6bf95412943386515cebe84b..002c858e52a9080568acf9b8b92cb6ec591bb81d 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -4254,7 +4254,9 @@ void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
|
| V8ValueConverterImpl converter;
|
| converter.SetDateAllowed(true);
|
| converter.SetRegexpAllowed(true);
|
| - list.Set(0, converter.FromV8Value(result, context));
|
| + base::Value* result_value = converter.FromV8Value(result, context);
|
| + list.Set(0, result_value ? result_value :
|
| + base::Value::CreateNullValue());
|
| } else {
|
| list.Set(0, Value::CreateNullValue());
|
| }
|
|
|