Changeset 901cee9

Timestamp:

Jul 4, 2011, 12:50:55 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

4a01fc6, 95c7f0c, 401752a

Parents:

785ee77

git-author:

Jason Gross <jgross@mit.edu> (07/03/11 23:42:26)

git-committer:

Jason Gross <jgross@mit.edu> (07/04/11 00:50:55)

Message:

Don't segfault when you expunge all messages from the messagelist

When we used owl_list, trying to get an element from an empty list would
return NULL.  When we moved to GPtrArray, we dropped this checking,
without dropping the assumption that, e.g.,
 owl_view_get_element(v, owl_global_get_curmsg(&g));
works everywhere.  This commit adds the logic back in to deal with this
case.

Additionally, don't segfault on things like :unpunt -1.

Files:

• commands.c (modified) (1 diff)
• messagelist.c (modified) (1 diff)

commands.c

@@ -2498 +2498 @@
   } else if(argc == 2) {
     /* Handle :unpunt <number> */
-    if(unpunt && (i=atoi(argv[1])) !=0) {
+    if (unpunt && (i = atoi(argv[1])) > 0) {
       i--;      /* Accept 1-based indexing */
       if (i < fl->len) {

messagelist.c

@@ -22 +22 @@
 void *owl_messagelist_get_element(const owl_messagelist *ml, int n)
 {
+  /* we assume things like owl_view_get_element(v, owl_global_get_curmsg(&g))
+   * work even when there are no messages in the message list.  So don't
+   * segfault if someone asks for the zeroth element of an empty list.
+   */
+  if (n >= ml->list->len) return NULL;
   return ml->list->pdata[n];
 }