Merge pull request #259 from asmorkalov:manager_outofbound_fix

12 years ago · 1af55b4bcb
parent efecf3b8fd 064bf167ad
commit 1af55b4bcb
1 changed files with 9 additions and 3 deletions
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@ -402,10 +402,16 @@ public class ManagerActivity extends Activity

    protected String NormalizeVersion(String OpenCVersion, String PackageVersion)
    {
+        if (OpenCVersion == null || PackageVersion == null)
+            return "unknown";
+
        int dot = PackageVersion.indexOf(".");
-        return OpenCVersion.substring(0,  OpenCVersion.length()-1) + "." +
-            OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
-            PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
+        if (dot == -1 || OpenCVersion.length() == 0)
+            return "unknown";
+        else
+            return OpenCVersion.substring(0,  OpenCVersion.length()-1) + "." +
+                OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
+                PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
    }

    protected String ConvertPackageName(String Name, String Version)