From 064bf167ad0cd4cc658383aaae9d57fd977076db Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 24 Dec 2012 18:05:48 +0400 Subject: [PATCH] OpenCV Manager crashes with exception (Bug #2660) String checking and range cheching added. --- .../org/opencv/engine/manager/ManagerActivity.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java index 7c4b8e4c7..6f604fb87 100644 --- 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)