GH-63 Revert e64c60a to avoid double-free; forgot that

alineInit() setups a clean-up handler.
SirWumpus · Nov 8, 2024 · cd162f5 · cd162f5
1 parent e64c60a
commit cd162f5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/src/aline.c b/src/aline.c
@@ -67,7 +67,7 @@ sig_winch(int signum)
 }
 #pragma GCC diagnostic pop
 
-void
+static void
 alineFini(void)
 {
 	alineSetMode(ALINE_CANONICAL);

diff --git a/src/aline.h b/src/aline.h
@@ -53,7 +53,6 @@ extern struct winsize window;
 
 #define ALINE_HISTORY		16
 
-extern void alineFini(void);
 extern int alineInit(int hist_size);
 extern int alineReadByte(void);
 extern int alineSetMode(int mode);

diff --git a/src/main.c b/src/main.c
@@ -61,7 +61,6 @@ cleanup(void)
 	p4Free(ctx_main);
 	/* This is redundant too, but I like it for symmetry. */
 	sig_fini();
-	p4Fini();
 }
 
 int

diff --git a/src/post4.h b/src/post4.h
@@ -585,8 +585,6 @@ typedef struct {
  */
 extern void p4Init(P4_Options *opts);
 
-#define p4Fini()	alineFini()
-
 /**
  * Create a new interpreter context.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -585,8 +585,6 @@ typedef struct { @@
      */
     extern void p4Init(P4_Options *opts);
-    #define p4Fini()	alineFini()
     /**
      * Create a new interpreter context.
      *
@@ Expand Down @@