Re: PATCH: Remeta one frame earlier

[Mikael Magnusson <mikachu@gmail.com>]

On Mon, Feb 23, 2015 at 3:05 PM, Peter Stephenson <p.stephenson@samsung.com> wrote:
> On Mon, 23 Feb 2015 14:51:09 +0100
> Mikael Magnusson <mikachu@gmail.com> wrote:
>> +         int remeta;
>
> ... except you haven't initialised remeta to 0.

Oops, I added it here after the compiler complained, and then removed
it from the other file after, so overlooked the initialization. I guess
I got lucky with my zero pages. Here's an incremental patch that fixes this,
and stops having two separate pt/ptr variables.

> If we do stick with the heap, I'm wondering if we need to free it more
> often than we do.  Maybe the freeheap() below should be if (uselex ||
> remeta), and maybe it should be right at the end of the loop for
> safety.

I'll leave this part to you... At least nothing after the freeheap()
uses pt, so it shouldn't be any less safe than before™.

> Long discussion for moving a bit of code...

But super fun~

---
 Src/hist.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Src/hist.c b/Src/hist.c
index c5cf43e..5a8c75e 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2501,9 +2501,8 @@ readhistfile(char *fn, int err, int readflags)
 	 || (hist_ignore_all_dups && newflags & hist_skip_flags))
 	    newflags |= HIST_MAKEUNIQUE;
 	while (fpos = ftell(in), (l = readhistline(0, &buf, &bufsiz, in))) {
-	    char *pt = buf;
-	    char *ptr;
-	    int remeta;
+	    char *pt;
+	    int remeta = 0;
 
 	    if (l < 0) {
 		zerr("corrupt history file %s", fn);
@@ -2521,17 +2520,19 @@ readhistfile(char *fn, int err, int readflags)
 	     * This is rare so doesn't need to be that efficient; just
 	     * allocate space off the heap.
 	     */
-	    for (ptr = pt; *ptr; ptr++) {
-		if (*ptr == Meta && ptr[1])
-		    ptr++;
-		else if (imeta(*ptr)) {
+	    for (pt = buf; *pt; pt++) {
+		if (*pt == Meta && pt[1])
+		    pt++;
+		else if (imeta(*pt)) {
 		    remeta = 1;
 		    break;
 		}
 	    }
 	    if (remeta) {
-		unmetafy(pt, &remeta);
-		pt = metafy(pt, remeta, META_USEHEAP);
+		unmetafy(buf, &remeta);
+		pt = metafy(buf, remeta, META_USEHEAP);
+	    } else {
+		pt = buf;
 	    }
 
 	    if (*pt == ':') {
-- 
2.2.0.GIT