experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

problems w regexp compiled void pointers and memory

Browse source
This commit is contained in:
Olof hagsand 2019-05-29 22:49:57 +02:00
parent 55f9b7cab0
commit 2e23a8c275
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/clixon_yang_type.c
View file

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