Workaround for memory leak in flex.

diff --git a/gedcom/gedcom_1byte.lex b/gedcom/gedcom_1byte.lex
index 6431dcfdcbdae061043c5947331fd376c1b7d9f1..6fa1d6b0293089b3f4573f8482d7ecd1e1d6eb4e 100644 (file)
--- a/gedcom/gedcom_1byte.lex
+++ b/gedcom/gedcom_1byte.lex
@@ -216,8 +216,12 @@ ACTION_BEFORE_REGEXPS
 
 %%
 
+static int exitfuncregistered = 0;
+
 int yywrap()
 {
+  if (! exitfuncregistered && atexit(yylex_cleanup) == 0)
+    exitfuncregistered = 1;
   return 1;
 }
 

diff --git a/gedcom/gedcom_hilo.lex b/gedcom/gedcom_hilo.lex
index c7a715133d8f596fa43f1f56d3c91b8a4d634a86..a5216bb7561343014e8a648a81844722c27c411a 100644 (file)
--- a/gedcom/gedcom_hilo.lex
+++ b/gedcom/gedcom_hilo.lex
@@ -219,8 +219,12 @@ ACTION_BEFORE_REGEXPS
 
 %%
 
+static int exitfuncregistered = 0;
+
 int yywrap()
 {
+  if (! exitfuncregistered && atexit(yylex_cleanup) == 0)
+    atexit(yylex_cleanup);
   return 1;
 }
 

diff --git a/gedcom/gedcom_lex_common.c b/gedcom/gedcom_lex_common.c
index 3785da2a8960d7bec5cd88a92e3bcf87f93450f3..045cea22d3ba46e2bb3c64500efafe5c784263d1 100644 (file)
--- a/gedcom/gedcom_lex_common.c
+++ b/gedcom/gedcom_lex_common.c
@@ -136,6 +136,13 @@ static void error_unexpected_character(const char* str, char ch)
   gedcom_error(_("Unexpected character: '%s' (0x%02x)"), str, ch);
 }
 
+static void yylex_cleanup()
+{
+  /* fix memory leak in lex */
+  yy_delete_buffer(yy_current_buffer);
+  yy_current_buffer = NULL;
+}
+
 #else  /* of #ifndef IN_LEX */
 
 #define TO_INTERNAL(STR,OUTBUF) \

diff --git a/gedcom/gedcom_lohi.lex b/gedcom/gedcom_lohi.lex
index d6092a6d67d158c3bb2e9a8c7baf27b53dc72826..a2f82a96cd361f8ba4d89330fe13180f2eb57b5c 100644 (file)
--- a/gedcom/gedcom_lohi.lex
+++ b/gedcom/gedcom_lohi.lex
@@ -219,8 +219,12 @@ ACTION_BEFORE_REGEXPS
 
 %%
 
+static int exitfuncregistered = 0;
+
 int yywrap()
 {
+  if (! exitfuncregistered && atexit(yylex_cleanup) == 0)
+    atexit(yylex_cleanup);
   return 1;
 }