Commit 93f5bfdb authored by lrn@chromium.org's avatar lrn@chromium.org

Make the irregexp interpreter throw on stack overflow.

BUG=v8:904

Review URL: http://codereview.chromium.org/8387027

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9780 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent f8f8c672
......@@ -33,9 +33,9 @@
#include "utils.h"
#include "ast.h"
#include "bytecodes-irregexp.h"
#include "jsregexp.h"
#include "interpreter-irregexp.h"
namespace v8 {
namespace internal {
......@@ -187,12 +187,12 @@ class BacktrackStack {
template <typename Char>
static bool RawMatch(Isolate* isolate,
const byte* code_base,
Vector<const Char> subject,
int* registers,
int current,
uint32_t current_char) {
static RegExpImpl::IrregexpResult RawMatch(Isolate* isolate,
const byte* code_base,
Vector<const Char> subject,
int* registers,
int current,
uint32_t current_char) {
const byte* pc = code_base;
// BacktrackStack ensures that the memory allocated for the backtracking stack
// is returned to the system or cached if there is no stack being cached at
......@@ -211,24 +211,24 @@ static bool RawMatch(Isolate* isolate,
switch (insn & BYTECODE_MASK) {
BYTECODE(BREAK)
UNREACHABLE();
return false;
return RegExpImpl::RE_FAILURE;
BYTECODE(PUSH_CP)
if (--backtrack_stack_space < 0) {
return false; // No match on backtrack stack overflow.
return RegExpImpl::RE_EXCEPTION;
}
*backtrack_sp++ = current;
pc += BC_PUSH_CP_LENGTH;
break;
BYTECODE(PUSH_BT)
if (--backtrack_stack_space < 0) {
return false; // No match on backtrack stack overflow.
return RegExpImpl::RE_EXCEPTION;
}
*backtrack_sp++ = Load32Aligned(pc + 4);
pc += BC_PUSH_BT_LENGTH;
break;
BYTECODE(PUSH_REGISTER)
if (--backtrack_stack_space < 0) {
return false; // No match on backtrack stack overflow.
return RegExpImpl::RE_EXCEPTION;
}
*backtrack_sp++ = registers[insn >> BYTECODE_SHIFT];
pc += BC_PUSH_REGISTER_LENGTH;
......@@ -278,9 +278,9 @@ static bool RawMatch(Isolate* isolate,
pc += BC_POP_REGISTER_LENGTH;
break;
BYTECODE(FAIL)
return false;
return RegExpImpl::RE_FAILURE;
BYTECODE(SUCCEED)
return true;
return RegExpImpl::RE_SUCCESS;
BYTECODE(ADVANCE_CP)
current += insn >> BYTECODE_SHIFT;
pc += BC_ADVANCE_CP_LENGTH;
......@@ -625,11 +625,12 @@ static bool RawMatch(Isolate* isolate,
}
bool IrregexpInterpreter::Match(Isolate* isolate,
Handle<ByteArray> code_array,
Handle<String> subject,
int* registers,
int start_position) {
RegExpImpl::IrregexpResult IrregexpInterpreter::Match(
Isolate* isolate,
Handle<ByteArray> code_array,
Handle<String> subject,
int* registers,
int start_position) {
ASSERT(subject->IsFlat());
AssertNoAllocation a;
......
// Copyright 2008 the V8 project authors. All rights reserved.
// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
......@@ -36,11 +36,11 @@ namespace internal {
class IrregexpInterpreter {
public:
static bool Match(Isolate* isolate,
Handle<ByteArray> code,
Handle<String> subject,
int* captures,
int start_position);
static RegExpImpl::IrregexpResult Match(Isolate* isolate,
Handle<ByteArray> code,
Handle<String> subject,
int* captures,
int start_position);
};
......
......@@ -509,14 +509,16 @@ RegExpImpl::IrregexpResult RegExpImpl::IrregexpExecOnce(
}
Handle<ByteArray> byte_codes(IrregexpByteCode(*irregexp, is_ascii), isolate);
if (IrregexpInterpreter::Match(isolate,
byte_codes,
subject,
register_vector,
index)) {
return RE_SUCCESS;
}
return RE_FAILURE;
IrregexpResult result = IrregexpInterpreter::Match(isolate,
byte_codes,
subject,
register_vector,
index);
if (result == RE_EXCEPTION) {
ASSERT(!isolate->has_pending_exception());
isolate->StackOverflow();
}
return result;
#endif // V8_INTERPRETED_REGEXP
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment