From 4f2e80ef28b80b1d7c1c83e0963f6eb526a5ce58 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Wed, 28 Aug 2013 14:47:47 -0400
Subject: [PATCH] added infinite loop check

---
 src/friendlist.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/friendlist.c b/src/friendlist.c
index 35c6295..6e420bf 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <ctype.h>
 #include <stdbool.h>
+#include <stdlib.h>
 
 #include <tox/tox.h>
 
@@ -61,7 +62,7 @@ void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t
 
 int friendlist_onFriendAdded(Tox *m, int num)
 {
-    if (num_friends == MAX_FRIENDS_NUM)
+    if (num_friends < 0 || num_friends >= MAX_FRIENDS_NUM)
         return -1;
 
     int i;
@@ -91,15 +92,19 @@ static void select_friend(wint_t key)
         return;
 
     int n = num_selected;
+    int f_inf = num_selected;
 
     if (key == KEY_UP) {
         while (true) {
-            if (--n < 0)
-                n = num_friends-1;
+            if (--n < 0) n = num_friends-1;
             if (friends[n].active) {
                 num_selected = n;
                 return;
             }
+            if (n == f_inf) {
+                endwin();
+                exit(2);
+            }
         }
     } else if (key == KEY_DOWN) {
         while (true) {
@@ -108,6 +113,10 @@ static void select_friend(wint_t key)
                 num_selected = n;
                 return;
             }
+            if (n == f_inf) {
+                endwin();
+                exit(2);
+            }
         }
     }
 }
@@ -120,7 +129,7 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
     
     int i;
 
-    for (i = num_friends; i != 0; --i) {
+    for (i = num_friends; i > 0; --i) {
         if (friends[i-1].active)
             break;
     }