2011-02-22 Chris Allegretta <chrisa@asty.org>

        * color.c (nfreeregex): Fix that we were trying to set the pointer passed by value
          to NULL.  Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4532 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 9653a93fff69dd19ed29ca268cde990b78626440..eb8c43247e38368618c08b2301b80520e07ea346 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22 Chris Allegretta <chrisa@asty.org>
+       * color.c (nfreeregex): Fix that we were trying to set the pointer passed by value
+         to NULL.  Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune.
+
 2011-02-18 Chris Allegretta <chrisa@asty.org>
        * New saved cursor position history option.  Command line option -P or --poslog, rc file
          entry "poslog".  Search history changes to ~/.nano/search_history, cursor position log
@@ -7,7 +11,7 @@
          4.15 discussing the change and offering an interoperability workaround.
        * files.c (load_history): Set last_search to the last search value we loaded from history,
          so do_research will succeed without needing to manually load the last seach in.  Fixes
-         bug reported by Matt "ML" at gmail.
+         bug reported by Matthieu Lejeune.
 
 2011-02-12 Chris Allegretta <chrisa@asty.org>
        * Initial libmagic implementation, adapted from Eitan Adler <eitanadlerlist@gmail.com>.

diff --git a/src/color.c b/src/color.c
index 580fcaa01567b52b4e6185d75e2d8dfeedbea8d9..f98ad068d76477726b87079d5c60e47d6b749568 100644 (file)
--- a/src/color.c
+++ b/src/color.c
@@ -108,13 +108,13 @@ void color_init(void)
 }
 
 /* Cleanup a regex we previously compiled */
-void nfreeregex(regex_t *r)
+void nfreeregex(regex_t **r)
 {
     assert(r != NULL);
 
-    regfree(r);
-    free(r);
-    r = NULL;
+    regfree(*r);
+    free(*r);
+    *r = NULL;
 }
 
 /* Update the color information based on the current filename. */
@@ -219,7 +219,7 @@ void color_update(void)
                /* Decompile e->ext_regex's specified regex if we aren't
                 * going to use it. */
                if (not_compiled)
-                   nfreeregex(e->ext);
+                   nfreeregex(&e->ext);
            }
        }
 
@@ -251,7 +251,7 @@ void color_update(void)
                    }
 
                    if (not_compiled)
-                       nfreeregex(e->ext);
+                       nfreeregex(&e->ext);
                }
            }
        }
@@ -292,7 +292,7 @@ void color_update(void)
                    /* Decompile e->ext_regex's specified regex if we aren't
                     * going to use it. */
                    if (not_compiled)
-                       nfreeregex(e->ext);
+                       nfreeregex(&e->ext);
                }
            }
        }