diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -7974,7 +7974,7 @@
   if (pattern)
     COMMON_INTERCEPTOR_READ_RANGE(ctx, pattern, internal_strlen(pattern) + 1);
   int res = REAL(regcomp)(preg, pattern, cflags);
-  if (!res)
+  if (preg)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, preg, struct_regex_sz);
   return res;
 }
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
@@ -42,23 +42,30 @@
 int main(void) {
   printf("regex\n");
 
-  regex_t regex;
-  int rv = regcomp(&regex, "[[:upper:]]\\([[:upper:]]\\)", 0);
-  assert(!rv);
+  {
+    regex_t regex;
+    int rv = regcomp(&regex, "[[:upper:]]\\([[:upper:]]\\)", 0);
+    assert(!rv);
 
-  test_matched(&regex, "abc");
-  test_matched(&regex, "ABC");
+    test_matched(&regex, "abc");
+    test_matched(&regex, "ABC");
 
-  test_print_matches(&regex, "ABC");
+    test_print_matches(&regex, "ABC");
 
-  regfree(&regex);
+    regfree(&regex);
+  }
 
-  rv = regcomp(&regex, "[[:upp:]]", 0);
-  assert(rv);
+  {
+    regex_t regex;
+    int rv = regcomp(&regex, "[[:upp:]]", 0);
+    assert(rv);
 
-  char errbuf[1024];
-  regerror(rv, &regex, errbuf, sizeof errbuf);
-  printf("error: %s\n", errbuf);
+    char errbuf[1024];
+    regerror(rv, &regex, errbuf, sizeof errbuf);
+    printf("error: %s\n", errbuf);
+
+    regfree(&regex);
+  }
 
   // CHECK: regex
   // CHECK: abc: not-matched