Minor null checking

IOSMonkey · May 23, 2013 · 6b48c8b · 6b48c8b
1 parent 412457a
commit 6b48c8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/quickdialog/QBindingEvaluator.m b/quickdialog/QBindingEvaluator.m
@@ -134,9 +134,12 @@ - (void)fetchValueFromObject:(QElement *)element toData:(id)data {
         NSString *propName = [((NSString *) [bindingParams objectAtIndex:0]) stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
         NSString *valueName = [((NSString *) [bindingParams objectAtIndex:1]) stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
 
-        if (![propName isEqualToString:@"iterate"] && ![valueName isEqualToString:@"self"])
-            [data setValue:[element valueForKey:propName] forKeyPath:valueName];
+        if (![propName isEqualToString:@"iterate"] && ![valueName isEqualToString:@"self"]) {
+            id value = [element valueForKeyPath:propName];
+            if (propName!= nil && value!=nil)
+                [data setValue:value forKeyPath:valueName];
+        }
     }
 
 }
-@end
+@end
diff --git a/quickdialog/QRadioElement.m b/quickdialog/QRadioElement.m
@@ -48,6 +48,9 @@ -(void)setItems:(NSArray *)items {
 }
 
 -(NSObject *)selectedValue {
+    if (_selected<0 || _selected>=_values.count)
+        return nil;
+
     return [_values objectAtIndex:(NSUInteger) _selected];
 }
 
@@ -87,7 +90,7 @@ - (QRadioElement *)initWithDict:(NSDictionary *)valuesDictionary selected:(int)s
 
 
 -(void)setSelectedItem:(id)item {
-    if (self.items==nil)
+    if (self.items==nil || item==nil)
         return;
     self.selected = [self.items indexOfObject:item];
 }