|
|
@@ -630,12 +630,16 @@ - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arr
|
|
|
|
|
|
while (idx < queryCount) {
|
|
|
|
|
|
- if (arrayArgs) {
|
|
|
+ if (arrayArgs && idx < [arrayArgs count]) {
|
|
|
obj = [arrayArgs objectAtIndex:(NSUInteger)idx];
|
|
|
}
|
|
|
- else {
|
|
|
+ else if (args) {
|
|
|
obj = va_arg(args, id);
|
|
|
}
|
|
|
+ else {
|
|
|
+ //We ran out of arguments
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
if (_traceExecution) {
|
|
|
NSLog(@"obj: %@", obj);
|
|
|
@@ -815,12 +819,16 @@ - (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArra
|
|
|
|
|
|
while (idx < queryCount) {
|
|
|
|
|
|
- if (arrayArgs) {
|
|
|
+ if (arrayArgs && idx < [arrayArgs count]) {
|
|
|
obj = [arrayArgs objectAtIndex:(NSUInteger)idx];
|
|
|
}
|
|
|
- else {
|
|
|
+ else if (args) {
|
|
|
obj = va_arg(args, id);
|
|
|
}
|
|
|
+ else {
|
|
|
+ //We ran out of arguments
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
if (_traceExecution) {
|
|
|
NSLog(@"obj: %@", obj);
|