Merge remote-tracking branch 'upstream/dev' into single-file-lib

contrib/diagnose_corruption/check_flipped_bits.c

@@ -100,11 +100,14 @@ static char* readFile(const char* filename, size_t* size) {
   buf = malloc(*size);
   if (buf == NULL) {
     fprintf(stderr, "malloc failed\n");
+    fclose(f);
+    return NULL;
   }
 
   bytes_read = fread(buf, 1, *size, f);
   if (bytes_read != *size) {
     fprintf(stderr, "failed to read whole file\n");
+    fclose(f);
     free(buf);
     return NULL;
   }