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
@@ -7904,8 +7904,7 @@
   if (pattern)
     COMMON_INTERCEPTOR_READ_RANGE(ctx, pattern, internal_strlen(pattern) + 1);
   int res = REAL(regcomp)(preg, pattern, cflags);
-  if (!res)
-    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, preg, struct_regex_sz);
+  COMMON_INTERCEPTOR_WRITE_RANGE(ctx, preg, struct_regex_sz);
   return res;
 }
 INTERCEPTOR(int, regexec, const void *preg, const char *string, SIZE_T nmatch,
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
@@ -43,7 +43,16 @@
   printf("regex\n");
 
   regex_t regex;
-  int rv = regcomp(&regex, "[[:upper:]]\\([[:upper:]]\\)", 0);
+  int rv = regcomp(&regex, "[[:upp:]]", 0);
+  assert(rv);
+
+  char errbuf[1024];
+  regerror(rv, &regex, errbuf, sizeof errbuf);
+  printf("error: %s\n", errbuf);
+
+  regfree(&regex);
+
+  rv = regcomp(&regex, "[[:upper:]]\\([[:upper:]]\\)", 0);
   assert(!rv);
 
   test_matched(&regex, "abc");
@@ -53,19 +62,12 @@
 
   regfree(&regex);
 
-  rv = regcomp(&regex, "[[:upp:]]", 0);
-  assert(rv);
-
-  char errbuf[1024];
-  regerror(rv, &regex, errbuf, sizeof errbuf);
-  printf("error: %s\n", errbuf);
-
   // CHECK: regex
+  // CHECK: error:{{.*}}
   // CHECK: abc: not-matched
   // CHECK: ABC: matched
   // CHECK: matched[0]='AB'
   // CHECK: matched[1]='B'
-  // CHECK: error:{{.*}}
 
   return 0;
 }