1 files changed, 6 insertions, 5 deletions
diff --git a/font_service/collection.h b/font_service/collection.h
index d65a024..66dd850 100644
--- a/font_service/collection.h
+++ b/font_service/collection.h
@@ -168,7 +168,7 @@ public:
 	DynamicArray(unsigned long init = 0, unsigned long inc = 1): Collection<T>(), ar(0), initial(init), limit(init), increment(inc) {
 		if(limit) ar = (T *)malloc(limit * sizeof(T));
 	}
-	virtual ~DynamicArray() {free(ar);}
+	virtual ~DynamicArray() {if(ar) free(ar);}
 
 	virtual void clear() {
 		Collection<T>::count = 0;
@@ -267,10 +267,11 @@ public:
 			if ( DynamicArray<T>::ar[i] == val )
 			{	index = i;
 				return true;
-			} else if (DynamicArray<T>::ar[i] < val)
-				low = i+1;
-			else
-				high = i-1;
+			} else 
+				if (DynamicArray<T>::ar[i] < val)
+					low = i+1;
+				else
+					high = i-1;
 		}
 
 		index = low;