From 2e23a8c27593b087b2635959ae685f3fb80683c0 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 29 May 2019 22:49:57 +0200
Subject: [PATCH] problems w regexp compiled void pointers and memory

---
 lib/src/clixon_yang_type.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c
index f03132dd..a4132d0b 100644
--- a/lib/src/clixon_yang_type.c
+++ b/lib/src/clixon_yang_type.c
@@ -250,7 +250,6 @@ yang_type_cache_cp(yang_type_cache **ycnew,
     cvec      *cvv;
     cvec      *patterns = NULL;
     int        rxmode;
-    cvec      *regexps = NULL;
     uint8_t    fraction;
     yang_stmt *resolved;
 
@@ -258,19 +257,16 @@ yang_type_cache_cp(yang_type_cache **ycnew,
 	clicon_err(OE_UNIX, errno, "cvec_new");
 	goto done;
     }
-    if ((regexps = cvec_new(0)) == NULL){
-	clicon_err(OE_UNIX, errno, "cvec_new");
-	goto done;
-    }
-    yang_type_cache_get(ycold, &resolved, &options, &cvv, patterns, &rxmode, regexps, &fraction);
-    if (yang_type_cache_set(ycnew, resolved, options, cvv, patterns, rxmode, regexps, fraction) < 0)
+    /* Note, regexps are not copied since they are voids, if they were, they
+     * could not be freed in a simple way since copies are made at augment/group
+     */
+    yang_type_cache_get(ycold, &resolved, &options, &cvv, patterns, &rxmode, NULL, &fraction);
+    if (yang_type_cache_set(ycnew, resolved, options, cvv, patterns, rxmode, NULL, fraction) < 0)
 	goto done;
     retval = 0;
  done:
     if (patterns)
 	cvec_free(patterns);
-    if (regexps)
-	cvec_free(regexps);
     return retval;
 }
 
@@ -278,6 +274,7 @@ int
 yang_type_cache_free(yang_type_cache *ycache)
 {
     cg_var *cv;
+    void   *p;
     
     if (ycache->yc_cvv)
 	cvec_free(ycache->yc_cvv);
@@ -297,6 +294,10 @@ yang_type_cache_free(yang_type_cache *ycache)
 	    default:
 		break;
 	    }
+	    if ((p = cv_void_get(cv)) != NULL){
+		free(p);
+		cv_void_set(cv, NULL);
+	    }
 	}
 	cvec_free(ycache->yc_regexps);
     }
@@ -322,7 +323,7 @@ compile_pattern2regexp(clicon_handle h,
     int     retval = -1;
     cg_var *pcv; /* pattern cv */
     cg_var *rcv; /* regexp cv */
-    void   *re;
+    void   *re = NULL;
     int     ret;
     char   *pattern;
 
@@ -342,7 +343,9 @@ compile_pattern2regexp(clicon_handle h,
 	    clicon_err(OE_UNIX, errno, "cvec_add");
 	    goto done;
 	}
-	cv_void_set(rcv, re);
+	if (re != NULL)
+	    cv_void_set(rcv, re);
+	re = NULL;
 	/* invert pattern check */
 	if (cv_flag(pcv, V_INVERT))
 	    cv_flag_set(rcv, V_INVERT);