diff --git a/src/core/lib/support/tmpfile_msys.c b/src/core/lib/support/tmpfile_msys.c
index f0f803aa754df907dbb3edf7dffe4d28f06a8582..2fdc89a64f2f6193ca25f3f9219b1c4a8c180d24 100644
--- a/src/core/lib/support/tmpfile_msys.c
+++ b/src/core/lib/support/tmpfile_msys.c
@@ -57,15 +57,13 @@ FILE *gpr_tmpfile(const char *prefix, char **tmp_filename_out) {
   /* Generate a unique filename with our template + temporary path. */
   success = GetTempFileNameA(".", prefix, 0, tmp_filename);
   fprintf(stderr, "success = %d\n", success);
-  if (!success) goto end;
 
-  /* Open a file there. */
-  result = fopen(tmp_filename, "wb+");
-  fprintf(stderr, "result = %p\n", result);
-  if (result == NULL) goto end;
-
-end:
-  if (result && tmp_filename_out) {
+  if (success) {
+    /* Open a file there. */
+    result = fopen(tmp_filename, "wb+");
+    fprintf(stderr, "result = %p\n", result);
+  }
+  if (result != NULL && tmp_filename_out) {
     *tmp_filename_out = gpr_strdup(tmp_filename);
   }
 
diff --git a/third_party/boringssl b/third_party/boringssl
index 907ae62b9d81121cb86b604f83e6b811a43f7a87..c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 160000
--- a/third_party/boringssl
+++ b/third_party/boringssl
@@ -1 +1 @@
-Subproject commit 907ae62b9d81121cb86b604f83e6b811a43f7a87
+Subproject commit c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9