From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 8 Jul 2022 17:51:59 +0000 (-0700)
Subject: Fix use-after-free errors.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=2eaf2da8ecd5946a5a433b8679d09a70d0da670a

Fix use-after-free errors.

Found by GCC 12.1.1.
---

diff --git a/src/data/casewriter-translator.c b/src/data/casewriter-translator.c
index c750c7c73b..ef30406887 100644
--- a/src/data/casewriter-translator.c
+++ b/src/data/casewriter-translator.c
@@ -100,8 +100,8 @@ casewriter_translator_convert_to_reader (struct casewriter *writer UNUSED,
 {
   struct casewriter_translator *ct = ct_;
   struct casereader *reader = casewriter_make_reader (ct->subwriter);
-  free (ct);
   ct->destroy (ct->aux);
+  free (ct);
   return reader;
 }
 
diff --git a/src/output/spv/spv-legacy-decoder.c b/src/output/spv/spv-legacy-decoder.c
index e103dd842e..84397a04ab 100644
--- a/src/output/spv/spv-legacy-decoder.c
+++ b/src/output/spv/spv-legacy-decoder.c
@@ -1893,10 +1893,10 @@ decode_spvdx_table (const struct spvdx_visualization *v, const char *subtype,
 
       if (!progress)
         {
-          free (nodes);
           error = xasprintf ("Table has %zu variables with circular or "
                              "unresolved references, including variable %s.",
                              n_nodes, nodes[0]->id);
+          free (nodes);
           goto exit;
         }
     }