Ticket #37833: diff-fix-issue109-libsvm-bug.patch

src/machine/cxx/SVM.cc

@@ -178 +178 @@
   return buffer;
 }
 
+static boost::shared_ptr<svm_model> make_model(const char* filename) {
+  boost::shared_ptr<svm_model> retval(svm_load_model(filename), 
+      std::ptr_fun(svm_model_free));
+#if LIBSVM_VERSION > 315
+  if (retval) retval->sv_indices = 0; ///< force initialization: see ticket #109
+#endif 
+  return retval;
+}
+
 /**
  * Reverts the pickling process, returns the model
  */
@@ -193 +202 @@
   binfile.close();
 
   //reload the file using the appropriate libsvm loading method
-  boost::shared_ptr<svm_model> retval(svm_load_model(tmp_filename), 
-      std::ptr_fun(svm_model_free));
+  boost::shared_ptr<svm_model> retval = make_model(tmp_filename);
+
+  if (!retval) {
+    boost::format s("cannot open model file '%s'");
+    s % tmp_filename;
+    throw std::runtime_error(s.str());
+  }
 
   //unlinks the temporary file
   boost::filesystem::remove(tmp_filename); 
@@ -224 +238 @@
 }
 
 mach::SupportVector::SupportVector(const std::string& model_file):
-  m_model(svm_load_model(model_file.c_str()), std::ptr_fun(svm_model_free))
+  m_model(make_model(model_file.c_str()))
 {
   if (!m_model) {
     boost::format s("cannot open model file '%s'");