@@ -26,9 +26,10 @@ static const char kInterceptorName[] = "interceptor_name";
2626static const char kInterceptorViaFunction [] = " interceptor_via_fun" ;
2727static const char kInterceptorViaLibrary [] = " interceptor_via_lib" ;
2828static const char kODRViolation [] = " odr_violation" ;
29+ static const char kAllocDeallocMismatch [] = " alloc_dealloc_mismatch" ;
2930static const char *kSuppressionTypes [] = {
3031 kInterceptorName , kInterceptorViaFunction , kInterceptorViaLibrary ,
31- kODRViolation };
32+ kODRViolation , kAllocDeallocMismatch };
3233
3334SANITIZER_INTERFACE_WEAK_DEF (const char *, __asan_default_suppressions, void ) {
3435 return " " ;
@@ -52,7 +53,8 @@ bool IsInterceptorSuppressed(const char *interceptor_name) {
5253bool HaveStackTraceBasedSuppressions () {
5354 CHECK (suppression_ctx);
5455 return suppression_ctx->HasSuppressionType (kInterceptorViaFunction ) ||
55- suppression_ctx->HasSuppressionType (kInterceptorViaLibrary );
56+ suppression_ctx->HasSuppressionType (kInterceptorViaLibrary ) ||
57+ suppression_ctx->HasSuppressionType (kAllocDeallocMismatch );
5658}
5759
5860bool IsODRViolationSuppressed (const char *global_var_name) {
@@ -79,7 +81,12 @@ bool IsStackTraceSuppressed(const StackTrace *stack) {
7981 return true ;
8082 }
8183
82- if (suppression_ctx->HasSuppressionType (kInterceptorViaFunction )) {
84+ const char *suppressions[] = {kInterceptorViaFunction ,
85+ kAllocDeallocMismatch };
86+ for (const char *suppression : suppressions) {
87+ if (!suppression_ctx->HasSuppressionType (suppression)) {
88+ continue ;
89+ }
8390 SymbolizedStackHolder symbolized_stack (symbolizer->SymbolizePC (addr));
8491 const SymbolizedStack *frames = symbolized_stack.get ();
8592 CHECK (frames);
@@ -88,9 +95,8 @@ bool IsStackTraceSuppressed(const StackTrace *stack) {
8895 if (!function_name) {
8996 continue ;
9097 }
91- // Match "interceptor_via_fun" suppressions.
92- if (suppression_ctx->Match (function_name, kInterceptorViaFunction ,
93- &s)) {
98+ // Match suppressions.
99+ if (suppression_ctx->Match (function_name, suppression, &s)) {
94100 return true ;
95101 }
96102 }
0 commit comments