- Fixed a segfault bug in Nav.c.

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c04611e1..6b0737a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,7 @@ dillo-fltk2
  - Enabled client and server-side image maps.
  - Switched Window::destroy to Window::delete, fixing side effects.
  - Made zlib a configure requirement, and cleaned up configure.in.
+ - Fixed a segfault bug in Nav.c.
    Patches: place (AKA corvid)
 +- Fixed a problem with locally-installed dpis.
  - Added code for optional image loading (nice interface) very advanced!
diff --git a/src/nav.c b/src/nav.c
index 8d2b8dda..5ff41614 100644
--- a/src/nav.c
+++ b/src/nav.c
@@ -176,10 +176,12 @@ static void Nav_stack_clean(BrowserWindow *bw)
    dReturn_if_fail (bw != NULL);
 
    if ((i = a_Nav_stack_size(bw)) >= 2 &&
-       NAV_UIDX(bw,i - 2) == NAV_UIDX(bw,i -1)) {
+       NAV_UIDX(bw,i - 2) == NAV_UIDX(bw,i - 1)) {
       void *data = dList_nth_data (bw->nav_stack, i - 1);
       dList_remove_fast (bw->nav_stack, data);
       dFree(data);
+      if (bw->nav_stack_ptr >= a_Nav_stack_size(bw))
+         bw->nav_stack_ptr = a_Nav_stack_size(bw) - 1;
    }
 }