From 9c9dd9f06fa833bda1d1bb61984343747b6aaaef Mon Sep 17 00:00:00 2001
From: Dean Stevick <dean.stevick@icloud.com>
Date: Sat, 23 Jun 2018 09:02:06 -0500
Subject: [PATCH] Fix multi-arg predicate processing

Multi-arg predicates like "BETWEEN %@ AND %@" cause a crash in stringWithFormat since only one arg is given (i.e. "?,?").  The obvious intent was to supply two args "?" and "?".  Provided a fix that determines the number of args and appends them one at a time.
---
 Incremental Store/.EncryptedStore.m.swp | Bin 0 -> 16384 bytes
 Incremental Store/EncryptedStore.m      |  11 +++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Incremental Store/.EncryptedStore.m.swp

diff --git a/Incremental Store/.EncryptedStore.m.swp b/Incremental Store/.EncryptedStore.m.swp
new file mode 100644
index 0000000000000000000000000000000000000000..07c7b634d0d96e5fe7c34d8d74729760c577c90d
GIT binary patch
literal 16384
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
Bga-fs

literal 0
HcmV?d00001

diff --git a/Incremental Store/EncryptedStore.m b/Incremental Store/EncryptedStore.m
index aa7a382..e10b7fa 100755
--- a/Incremental Store/EncryptedStore.m	
+++ b/Incremental Store/EncryptedStore.m	
@@ -4189,8 +4189,15 @@ - (void)parseExpression:(NSExpression *)expression
             if (exprBinding) [*bindings addObject:exprBinding];
         }
 
-        *operand = [NSString stringWithFormat:[operator objectForKey:@"format"],
-                                                [subOperands componentsJoinedByString:@","]];
+        NSString *strFormat = [operator objectForKey:@"format"];
+        NSMutableString *strOperands = [NSMutableString string];
+        // Courtesy of Ruslan Soldatenko at https://stackoverflow.com/a/40638476
+        NSArray *arrComponents = strFormat ? [strFormat componentsSeparatedByString:@"%@"] : @[@""];
+        NSUInteger iterationCount = subOperands.count < arrComponents.count ? subOperands.count : arrComponents.count;
+        for ( NSUInteger i = 0; i < iterationCount; i++ )
+            [strOperands appendFormat:@"%@%@", arrComponents[i], subOperands[i]];
+        [strOperands appendString:[arrComponents lastObject]];
+        *operand = iterationCount == 0 ? [strOperands stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] : strOperands;
         *bindings = [*bindings cmdFlatten];
     }