diff --git a/ChangeLog b/ChangeLog index 08619413a7813f1c54f0db18614007e2d0e7cb5c..f6664004d2eeb3cd49285decda3cedbcdc70b333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-04-02 Chris Allegretta <chrisa@asty.org> + * files.c (do_writeout): Previous fixes should not cause a crash + when saving a new file. Discovered by Mike Frysinger <vapier@gentoo.org>. + 2010-04-07 Chris Allegretta <chrisa@asty.org> * doc/man/nano.1,nanorc.5: Add warnings about using backup mode as root due to the Dan Rosenberg security analysis. diff --git a/src/files.c b/src/files.c index 9a853360177f5454b7063086271096af8596ff8e..58355fad51d54824e81307086ab0f92a0f5903f3 100644 --- a/src/files.c +++ b/src/files.c @@ -2136,8 +2136,8 @@ bool do_writeout(bool exiting) } #ifndef NANO_TINY - if (name_exists && openfile->current_stat && openfile->current_stat->st_mtime < st.st_mtime || - openfile->current_stat->st_dev != st.st_dev || openfile->current_stat->st_ino != st.st_ino) { + if (name_exists && (openfile->current_stat && openfile->current_stat->st_mtime < st.st_mtime || + openfile->current_stat->st_dev != st.st_dev || openfile->current_stat->st_ino != st.st_ino)) { i = do_yesno_prompt(FALSE, _("File was modified since you opened it, continue saving ? ")); if (i == 0 || i == -1)