github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check for misaligned memory in compile error code

Browse Source 
We now check that mem alloc for error message is aligned, and
fail with an appropriate message in the compile error.
This commit is contained in:
Matthew Barr
2016-07-27 16:55:28 +10:00
parent cded5552c2
commit b8d33732b5
3 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
unit/hyperscan/allocators.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Intel Corporation
* Copyright (c) 2015-2016, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -33,6 +33,9 @@
#include "test_util.h"
#include <cstdlib>
#include <string>
using std::string;
static void *null_malloc(size_t) { return nullptr; }
@@ -83,6 +86,22 @@ TEST(CustomAllocator, TwoAlignedCompile) {
hs_set_database_allocator(nullptr, nullptr);
}
TEST(CustomAllocator, TwoAlignedCompileError) {
hs_set_misc_allocator(two_aligned_malloc, two_aligned_free);
hs_database_t *db = nullptr;
hs_compile_error_t *compile_err = nullptr;
const hs_platform_info_t *platform = nullptr;
hs_error_t err =
hs_compile("\\1", 0, HS_MODE_BLOCK, platform, &db, &compile_err);
ASSERT_EQ(HS_COMPILER_ERROR, err);
ASSERT_EQ(nullptr, db);
ASSERT_NE(nullptr, compile_err);
EXPECT_STREQ("Allocator returned misaligned memory.", compile_err->message);
hs_free_compile_error(compile_err);
hs_set_database_allocator(nullptr, nullptr);
}
TEST(CustomAllocator, TwoAlignedDatabaseInfo) {
hs_database_t *db = buildDB("foobar", 0, 0, HS_MODE_BLOCK);
ASSERT_TRUE(db != nullptr);
@@ -149,3 +168,30 @@ TEST(CustomAllocator, TwoAlignedAllocScratch) {
hs_set_scratch_allocator(nullptr, nullptr);
hs_free_database(db);
}
TEST(CustomAllocator, NullMallocExpressionInfo) {
hs_set_allocator(null_malloc, nullptr);
string pattern = "foobar";
hs_expr_info_t *info = nullptr;
hs_compile_error_t *c_err = nullptr;
hs_error_t err = hs_expression_info(pattern.c_str(), 0, &info, &c_err);
ASSERT_EQ(HS_COMPILER_ERROR, err);
ASSERT_NE(nullptr, c_err);
hs_free_compile_error(c_err);
hs_set_allocator(nullptr, nullptr);
}
TEST(CustomAllocator, TwoAlignedExpressionInfo) {
hs_set_misc_allocator(two_aligned_malloc, two_aligned_free);
string pattern = "\\1";
hs_expr_info_t *info = nullptr;
hs_compile_error_t *c_err = nullptr;
hs_error_t err = hs_expression_info(pattern.c_str(), 0, &info, &c_err);
ASSERT_EQ(HS_COMPILER_ERROR, err);
ASSERT_NE(nullptr, c_err);
EXPECT_STREQ("Allocator returned misaligned memory.", c_err->message);
hs_free_compile_error(c_err);
hs_set_allocator(nullptr, nullptr);
}