Merge pull request #43 from alessiop86/gh-pages

A couple of fix avoiding segmentation fault and other errors when using the library in the Android version
jetpacapp · Mar 30, 2015 · 274366f · 274366f
2 parents 92a3f76 + 7b7f7ae
commit 274366f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/AndroidLibrary/jars/libjpcnn.so b/AndroidLibrary/jars/libjpcnn.so
diff --git a/examples/AndroidExample/libs/armeabi/libjpcnn.so b/examples/AndroidExample/libs/armeabi/libjpcnn.so
diff --git a/source/src/lib/svm/svm.cpp b/source/src/lib/svm/svm.cpp
@@ -2681,7 +2681,14 @@ int svm_save_model(const char *model_file_name, const svm_model *model)
 
 int svm_save_model_to_file_handle(FILE* fp, const svm_model* model) {
 
-	char *old_locale = strdup(setlocale(LC_ALL, NULL));
+	char *old_locale_nillable = setlocale(LC_ALL, NULL);	
+
+	char *old_locale; 
+	if (old_locale_nillable == NULL)
+		old_locale = NULL;
+	else
+		old_locale = strdup(old_locale_nillable);
+
 	setlocale(LC_ALL, "C");
 
 	const svm_parameter& param = model->param;
@@ -2797,7 +2804,14 @@ svm_model *svm_load_model(const char *model_file_name)
 	FILE *fp = fopen(model_file_name,"rb");
 	if(fp==NULL) return NULL;
 
-	char *old_locale = strdup(setlocale(LC_ALL, NULL));
+	char *old_locale_nillable = setlocale(LC_ALL, NULL);	
+
+	char *old_locale; 
+	if (old_locale_nillable == NULL)
+		old_locale = NULL;
+	else
+		old_locale = strdup(old_locale_nillable);
+
 	setlocale(LC_ALL, "C");
 
 	// read parameters