Merge pull request #421 from nilsms/master

Fixed incorrect substring usage in find
CBATeam · Jul 11, 2016 · ff71702 · ff71702
2 parents 0ed398b + 6969b3a
commit ff71702
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/addons/strings/fnc_find.sqf b/addons/strings/fnc_find.sqf
@@ -53,7 +53,7 @@ if(_initialIndex < 1) then {
     if(_initialIndex > (count _haystack) ) exitWith {
         -1
     };
-    private _tempString = [_haystack, _initialIndex, ((count _haystack) - _initialIndex)] call CBA_fnc_substring;
+    private _tempString = [_haystack, _initialIndex] call CBA_fnc_substr;
     _ret = _tempString find _needle;
     if(_ret > -1) then {
         _ret = _ret + _initialIndex;

diff --git a/addons/strings/test_strings.sqf b/addons/strings/test_strings.sqf
@@ -32,6 +32,9 @@ TEST_OP(_pos,==,-1,_fn);
 _pos = ["frofrog", "frog"] call CBA_fnc_find;
 TEST_OP(_pos,==,3,_fn);
 
+_pos = ["frog-headed fish", "f", 5] call CBA_fnc_find;
+TEST_OP(_pos,==,12,_fn);
+
 // ----------------------------------------------------------------------------
 // UNIT TESTS (stringSplit)
 _fn = "CBA_fnc_split";