From 510ec5ca0242d64bfbb17b0b7c54dcad680c4a39 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sun, 26 Jan 2020 23:08:40 -0500 Subject: [PATCH 1/2] valgrind findings --- c/mapping/mapper_altkv.c | 1 + doc/cookbook.html | 2 +- doc/data-examples.html | 2 +- doc/data-sharing.html | 32 ++++++++++++++++---------------- doc/reference-dsl.html | 2 +- doc/reference-verbs.html | 4 ++-- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/c/mapping/mapper_altkv.c b/c/mapping/mapper_altkv.c index b89f65fc7..676082e52 100644 --- a/c/mapping/mapper_altkv.c +++ b/c/mapping/mapper_altkv.c @@ -102,5 +102,6 @@ static sllv_t* mapper_altkv_process(lrec_t* pinrec, context_t* pctx, void* pvsta pe = pe->pnext; } + lrec_free(pinrec); return sllv_single(poutrec); } diff --git a/doc/cookbook.html b/doc/cookbook.html index c391ea7ad..c7281d5ef 100644 --- a/doc/cookbook.html +++ b/doc/cookbook.html @@ -858,7 +858,7 @@ date,qoh 
 $ wc -l data/miss-date.csv
-    1372 data/miss-date.csv
+1372 data/miss-date.csv

diff --git a/doc/data-examples.html b/doc/data-examples.html index 1be8faf43..4b27261a5 100644 --- a/doc/data-examples.html +++ b/doc/data-examples.html @@ -208,7 +208,7 @@ St. Johns - - - 

 $ wc -l data/colored-shapes.dkvp
-   10078 data/colored-shapes.dkvp
+10078 data/colored-shapes.dkvp

diff --git a/doc/data-sharing.html b/doc/data-sharing.html index b407c44b4..5072b0d45 100644 --- a/doc/data-sharing.html +++ b/doc/data-sharing.html @@ -206,11 +206,11 @@ Run as-is: 

 $ python polyglot-dkvp-io/example.py < data/small
-a=pan,b=pan,i=1,y=0.7268028627434533,ab=panpan,iy=1.7268028627434533,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=eks,b=pan,i=2,y=0.5221511083334797,ab=ekspan,iy=2.5221511083334796,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=wye,b=wye,i=3,y=0.33831852551664776,ab=wyewye,iy=3.3383185255166477,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=eks,b=wye,i=4,y=0.13418874328430463,ab=ekswye,iy=4.134188743284304,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
-a=wye,b=pan,i=5,y=0.8636244699032729,ab=wyepan,iy=5.863624469903273,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=pan,b=pan,i=1,y=0.726802862743,ab=panpan,iy=1.72680286274,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=eks,b=pan,i=2,y=0.522151108333,ab=ekspan,iy=2.52215110833,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=wye,b=wye,i=3,y=0.338318525517,ab=wyewye,iy=3.33831852552,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=eks,b=wye,i=4,y=0.134188743284,ab=ekswye,iy=4.13418874328,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float
+a=wye,b=pan,i=5,y=0.863624469903,ab=wyepan,iy=5.8636244699,ta=str,tb=str,ti=int,ty=float,tab=str,tiy=float

@@ -221,12 +221,12 @@ Run as-is, then pipe to Miller for pretty-printing: 

 $ python polyglot-dkvp-io/example.py < data/small | mlr --opprint cat
-a   b   i y                   ab     iy                 ta  tb  ti  ty    tab tiy
-pan pan 1 0.7268028627434533  panpan 1.7268028627434533 str str int float str float
-eks pan 2 0.5221511083334797  ekspan 2.5221511083334796 str str int float str float
-wye wye 3 0.33831852551664776 wyewye 3.3383185255166477 str str int float str float
-eks wye 4 0.13418874328430463 ekswye 4.134188743284304  str str int float str float
-wye pan 5 0.8636244699032729  wyepan 5.863624469903273  str str int float str float
+a   b   i y              ab     iy            ta  tb  ti  ty    tab tiy
+pan pan 1 0.726802862743 panpan 1.72680286274 str str int float str float
+eks pan 2 0.522151108333 ekspan 2.52215110833 str str int float str float
+wye wye 3 0.338318525517 wyewye 3.33831852552 str str int float str float
+eks wye 4 0.134188743284 ekswye 4.13418874328 str str int float str float
+wye pan 5 0.863624469903 wyepan 5.8636244699  str str int float str float

@@ -417,11 +417,11 @@ wye pan 5 0.5732889198020006 0.8636244699032729 {5} 

 $ mlr --opprint put '$o = system("echo -n ".$a."| sha1sum")' data/small
 a   b   i x                   y                   o
-pan pan 1 0.3467901443380824  0.7268028627434533  f29c748220331c273ef16d5115f6ecd799947f13  -
-eks pan 2 0.7586799647899636  0.5221511083334797  456d988ecb3bf1b75f057fc6e9fe70db464e9388  -
-wye wye 3 0.20460330576630303 0.33831852551664776 eab0de043d67f441c7fd1e335f0ca38708e6ebf7  -
-eks wye 4 0.38139939387114097 0.13418874328430463 456d988ecb3bf1b75f057fc6e9fe70db464e9388  -
-wye pan 5 0.5732889198020006  0.8636244699032729  eab0de043d67f441c7fd1e335f0ca38708e6ebf7  -
+pan pan 1 0.3467901443380824  0.7268028627434533  bd2bd8216b9cb4aa5a12daa6cfc98eef2ee20e56  -
+eks pan 2 0.7586799647899636  0.5221511083334797  16191338e81a46c7d127f5c8899f5c92e3cd38e3  -
+wye wye 3 0.20460330576630303 0.33831852551664776 14ba3c3e96a2474ab6dc7409ebf9d6b9cc3d84f0  -
+eks wye 4 0.38139939387114097 0.13418874328430463 16191338e81a46c7d127f5c8899f5c92e3cd38e3  -
+wye pan 5 0.5732889198020006  0.8636244699032729  14ba3c3e96a2474ab6dc7409ebf9d6b9cc3d84f0  -

diff --git a/doc/reference-dsl.html b/doc/reference-dsl.html index e43c87651..5e73309d2 100644 --- a/doc/reference-dsl.html +++ b/doc/reference-dsl.html @@ -2025,7 +2025,7 @@ subsequent assignments are done unconditionally: 

 $ mlr put '$x > 0.0; $y = log10($x); $z = sqrt($y)' data/put-gating-example-1.dkvp
 x=-1,y=nan,z=nan
-x=0,y=-inf,z=nan
+x=0,y=-inf,z=-nan
 x=1,y=0.000000,z=0.000000
 x=2,y=0.301030,z=0.548662
 x=3,y=0.477121,z=0.690740
diff --git a/doc/reference-verbs.html b/doc/reference-verbs.html
index 6b7e28ccd..4e7b4b83e 100644
--- a/doc/reference-verbs.html
+++ b/doc/reference-verbs.html
@@ -3956,7 +3956,7 @@ Options:
 

 
 $ wc -l data/colored-shapes.dkvp
-   10078 data/colored-shapes.dkvp
+10078 data/colored-shapes.dkvp
 

 

 

@@ -4128,7 +4128,7 @@ color=purple,shape=square,flag=0
 

 
 $ wc -l data/repeats.dkvp
-      57 data/repeats.dkvp
+57 data/repeats.dkvp
 

 

 


From eabc91964c8814c83cbf8479e1f5d80a24275742 Mon Sep 17 00:00:00 2001
From: John Kerl 
Date: Sun, 26 Jan 2020 23:18:18 -0500
Subject: [PATCH 2/2] valgrind findings

---
 c/lib/mvfuncs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/c/lib/mvfuncs.c b/c/lib/mvfuncs.c
index 0e83d6fc3..47dc843b9 100644
--- a/c/lib/mvfuncs.c
+++ b/c/lib/mvfuncs.c
@@ -495,7 +495,9 @@ mv_t s_s_lstrip_func(mv_t* pval1) {
 		while (isspace(*p)) {
 			p++;
 		}
-		return mv_from_string(mlr_strdup_or_die(p), FREE_ENTRY_VALUE);
+		char* retval = mlr_strdup_or_die(p);
+		mv_free(pval1);
+		return mv_from_string(retval, FREE_ENTRY_VALUE);
 	}
 }