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

Side by Side Diff: Source/bindings/v8/ScriptRegexp.cpp

Issue 300103002: ScriptRegexp::match(): gracefully fail if regexp.exec() throws. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/js/script-tests/regexp-match-exception.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Collabora Ltd. 3 * Copyright (C) 2008 Collabora Ltd.
4 * Copyright (C) 2011 Peter Varga (pvarga@webkit.org), University of Szeged 4 * Copyright (C) 2011 Peter Varga (pvarga@webkit.org), University of Szeged
5 * Copyright (C) 2013 Google Inc. All rights reserved. 5 * Copyright (C) 2013 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 73 v8::Isolate* isolate = v8::Isolate::GetCurrent();
74 v8::HandleScope handleScope(isolate); 74 v8::HandleScope handleScope(isolate);
75 v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureDomIn JSContext()); 75 v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureDomIn JSContext());
76 v8::TryCatch tryCatch; 76 v8::TryCatch tryCatch;
77 77
78 v8::Local<v8::RegExp> regex = m_regex.newLocal(isolate); 78 v8::Local<v8::RegExp> regex = m_regex.newLocal(isolate);
79 v8::Local<v8::Function> exec = regex->Get(v8AtomicString(isolate, "exec")).A s<v8::Function>(); 79 v8::Local<v8::Function> exec = regex->Get(v8AtomicString(isolate, "exec")).A s<v8::Function>();
80 v8::Handle<v8::Value> argv[] = { v8String(isolate, string.substring(startFro m)) }; 80 v8::Handle<v8::Value> argv[] = { v8String(isolate, string.substring(startFro m)) };
81 v8::Local<v8::Value> returnValue = V8ScriptRunner::callInternalFunction(exec , regex, WTF_ARRAY_LENGTH(argv), argv, isolate); 81 v8::Local<v8::Value> returnValue = V8ScriptRunner::callInternalFunction(exec , regex, WTF_ARRAY_LENGTH(argv), argv, isolate);
82 82
83 if (tryCatch.HasCaught())
84 return -1;
85
83 // RegExp#exec returns null if there's no match, otherwise it returns an 86 // RegExp#exec returns null if there's no match, otherwise it returns an
84 // Array of strings with the first being the whole match string and others 87 // Array of strings with the first being the whole match string and others
85 // being subgroups. The Array also has some random properties tacked on like 88 // being subgroups. The Array also has some random properties tacked on like
86 // "index" which is the offset of the match. 89 // "index" which is the offset of the match.
87 // 90 //
88 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec 91 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec
89 92
93 ASSERT(!returnValue.IsEmpty());
90 if (!returnValue->IsArray()) 94 if (!returnValue->IsArray())
91 return -1; 95 return -1;
92 96
93 v8::Local<v8::Array> result = returnValue.As<v8::Array>(); 97 v8::Local<v8::Array> result = returnValue.As<v8::Array>();
94 int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32()-> Value(); 98 int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32()-> Value();
95 if (matchLength) { 99 if (matchLength) {
96 v8::Local<v8::String> match = result->Get(0).As<v8::String>(); 100 v8::Local<v8::String> match = result->Get(0).As<v8::String>();
97 *matchLength = match->Length(); 101 *matchLength = match->Length();
98 } 102 }
99 103
100 return matchOffset + startFrom; 104 return matchOffset + startFrom;
101 } 105 }
102 106
103 } // namespace WebCore 107 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/js/script-tests/regexp-match-exception.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698