From 5293d5784049869c965ee21f424b8845bdebb745 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 20 Apr 2014 11:02:18 -0400 Subject: strtrim: reset pointer after trimming leading whitespace Breakage introduced in 92216c5864efccac when we changed the signature of strtrim to return something more useful. Fixes FS#39976. Signed-off-by: Allan McRae --- src/pacman/util.c | 1 + src/util/pactree.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index d42e27b8..ec2d3d2b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -299,6 +299,7 @@ size_t strtrim(char *str) size_t len = strlen(pch); if(len) { memmove(str, pch, len + 1); + pch = str; } else { *str = '\0'; } diff --git a/src/util/pactree.c b/src/util/pactree.c index 6c620aac..5c765428 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -159,6 +159,7 @@ static size_t strtrim(char *str) size_t len = strlen(pch); if(len) { memmove(str, pch, len + 1); + pch = str; } else { *str = '\0'; } -- cgit v1.2.3-55-g3dc8