From fe277b16f0861a327e1f6c00c0dbb8b00806d60d Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 5 Jul 2011 18:10:48 -0700 Subject: eval: fix memleak. --- libavutil/eval.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavutil/eval.c') diff --git a/libavutil/eval.c b/libavutil/eval.c index 4d55f42664..9bc40c1edc 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -489,6 +489,7 @@ int av_expr_parse(AVExpr **expr, const char *s, if ((ret = parse_expr(&e, &p)) < 0) goto end; if (*p.s) { + av_expr_free(e); av_log(&p, AV_LOG_ERROR, "Invalid chars '%s' at the end of expression '%s'\n", p.s, s0); ret = AVERROR(EINVAL); goto end; -- cgit v1.2.3 From dfd8116986a30e312a27269fbac702e885e0e673 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 5 Jul 2011 18:11:32 -0700 Subject: eval: add missing comma to tests. --- libavutil/eval.c | 2 +- tests/ref/fate/eval | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'libavutil/eval.c') diff --git a/libavutil/eval.c b/libavutil/eval.c index 9bc40c1edc..6d9b8e4208 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -559,7 +559,7 @@ int main(int argc, char **argv) "-PI", "+PI", "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", - "80G/80Gi" + "80G/80Gi", "1k", "1Gi", "1gi", diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index fb7a925b77..ad01891d9c 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -16,8 +16,11 @@ Evaluating '+PI' Evaluating '1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)' '1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)' -> 12.700000 -Evaluating '80G/80Gi1k' -'80G/80Gi1k' -> nan +Evaluating '80G/80Gi' +'80G/80Gi' -> 0.931323 + +Evaluating '1k' +'1k' -> 1000.000000 Evaluating '1Gi' '1Gi' -> 1073741824.000000 -- cgit v1.2.3