From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Fri, 16 Oct 2020 14:18:56 +0000 (+0200)
Subject: Fix crash on get_plugin_object_record()
X-Git-Tag: Release-11.3.2~908
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e131d7355dafaefdebbdaf5a029aa74782c1c34;p=thirdparty%2Fbacula.git

Fix crash on get_plugin_object_record()
---

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 22a7e1144..561bd8dbf 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -757,17 +757,17 @@ bool BDB::bdb_get_plugin_object_record(JCR *jcr, OBJECT_DBR *obj_r)
    int stat = false;
 
    if (obj_r->ObjectId > 0) {
-      Mmsg(tmp, "%s JobId=%lu ",
-           where_str.c_str()[0] == 0? "WHERE" : "AND",
-           obj_r->JobId);
+      Mmsg(tmp, "WHERE ObjectId=%lu ", obj_r->ObjectId);
       pm_strcat(where_str, tmp.c_str());
    }
 
    Mmsg(cmd,
-         "SELECT ObjectId, JobId, Path, Filename, PluginName, "
+         "SELECT ObjectId, JobId, Path, Filename, PluginName, ObjectCategory, "
                  "ObjectType, ObjectName, ObjectSource, ObjectUUID, ObjectSize "
          "FROM Object %s", where_str.c_str());
 
+   bdb_lock();
+
    if (QueryDB(jcr, cmd)) {
       if (sql_num_rows() > 1) {
          char ed1[30];