Merge branch '2.3' into develop

2019-02-01 13:55:54 +02:00
parent 968743f61a 08dd55a26a
commit 6038f1f386
31 changed files with 743 additions and 175 deletions
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@ -154,7 +154,7 @@ QUERY_CLASSIFIER* load_classifier(const char* name)
 {
    bool loaded = false;
    size_t len = strlen(name);
-    char libdir[len + 1];
+    char libdir[len + 3 + 1]; // Extra for ../

    sprintf(libdir, "../%s", name);