SAV reader: Fix memory leak

src/spss/readstat_sav.c

@@ -60,12 +60,7 @@ void sav_ctx_free(sav_ctx_t *ctx) {
     if (ctx->varinfo) {
         int i;
         for (i=0; i<ctx->var_index; i++) {
-            spss_varinfo_t *info = ctx->varinfo[i];
-            if (info) {
-                if (info->label)
-                    free(info->label);
-                free(info);
-            }
+            spss_varinfo_free(ctx->varinfo[i]);
         }
         free(ctx->varinfo);
     }

src/spss/readstat_sav_read.c

@@ -366,8 +366,7 @@ static readstat_error_t sav_read_variable_record(sav_ctx_t *ctx) {
 
 cleanup:
     if (retval != READSTAT_OK) {
-        if (info)
-            free(info);
+        spss_varinfo_free(info);
     }
 
     return retval;

src/spss/readstat_spss.c

@@ -73,6 +73,14 @@ int spss_varinfo_compare(const void *elem1, const void *elem2) {
     return (offset > v->offset);
 }
 
+void spss_varinfo_free(spss_varinfo_t *info) {
+    if (info) {
+        if (info->label)
+            free(info->label);
+        free(info);
+    }
+}
+
 static readstat_value_t spss_boxed_value(double fp_value) {
     readstat_value_t value = {
         .type = READSTAT_TYPE_DOUBLE,

src/spss/readstat_spss.h

@@ -82,6 +82,8 @@ typedef struct spss_varinfo_s {
 int spss_format(char *buffer, size_t len, spss_format_t *format);
 int spss_varinfo_compare(const void *elem1, const void *elem2);
 
+void spss_varinfo_free(spss_varinfo_t *info);
+
 readstat_missingness_t spss_missingness_for_info(spss_varinfo_t *info);
 readstat_variable_t *spss_init_variable_for_info(spss_varinfo_t *info, int index_after_skipping);