Index: src/trusted/validator_ragel/dfa_validate_64.c |
diff --git a/src/trusted/validator_ragel/dfa_validate_64.c b/src/trusted/validator_ragel/dfa_validate_64.c |
index f91d36fe95be581edacec83c3c3a303e2dec2f6e..13aa6a5aaa234d2390ae5f353d95493dda8e181d 100644 |
--- a/src/trusted/validator_ragel/dfa_validate_64.c |
+++ b/src/trusted/validator_ragel/dfa_validate_64.c |
@@ -39,9 +39,9 @@ static NaClValidationStatus ApplyDfaValidator_x86_64( |
NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f; |
enum NaClValidationStatus status = NaClValidationFailed; |
void *query = NULL; |
+ uint32_t options; |
struct StubOutCallbackData callback_data; |
- callback_data.flags = flags; |
- callback_data.did_rewrite = 0; |
+ |
UNREFERENCED_PARAMETER(guest_addr); |
if (stubout_mode) |
@@ -68,13 +68,21 @@ static NaClValidationStatus ApplyDfaValidator_x86_64( |
} |
} |
+ options = 0; |
+ callback_data.flags = flags; |
+ callback_data.chunk_processed_as_a_contiguous_stream = |
+ options & PROCESS_CHUNK_AS_A_CONTIGUOUS_STREAM; |
+ callback_data.bundle_begin_offset = (uintptr_t) data & kBundleMask; |
+ callback_data.cpu_features = cpu_features; |
+ callback_data.did_rewrite = 0; |
+ |
if (readonly_text) { |
- if (ValidateChunkAMD64(data, size, 0 /*options*/, cpu_features, |
+ if (ValidateChunkAMD64(data, size, options, cpu_features, |
NaClDfaProcessValidationError, |
NULL)) |
status = NaClValidationSucceeded; |
} else { |
- if (ValidateChunkAMD64(data, size, 0 /*options*/, cpu_features, |
+ if (ValidateChunkAMD64(data, size, options, cpu_features, |
NaClDfaStubOutUnsupportedInstruction, |
&callback_data)) |
status = NaClValidationSucceeded; |