cats: fix memory issues in catalog-test

bareos · Feb 24, 2022 · ff53655 · ff53655
1 parent 1c83b9a
commit ff53655
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/cats/sql_find.cc b/core/src/cats/sql_find.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -157,7 +157,7 @@ BareosDb::SqlFindResult BareosDb::FindLastJobStartTimeForJobAndClient(
                client_name.size());
 
   constexpr const char* default_time{"0000-00-00 00:00:00"};
-  stime_out.resize(strlen(default_time));
+  stime_out.resize(strlen(default_time) + 1);
   strcpy(stime_out.data(), default_time);
 
   Mmsg(cmd,

diff --git a/core/src/tests/catalog.cc b/core/src/tests/catalog.cc
@@ -119,6 +119,7 @@ void CatalogTest::SetUp()
 
 void CatalogTest::TearDown()
 {
+  db->CloseDatabase(jcr);
   DbSqlPoolDestroy();
   DbFlushBackends();
 
@@ -136,8 +137,6 @@ void CatalogTest::TearDown()
 TEST_F(CatalogTest, database)
 {
   std::vector<char> stime;
-  auto jcr = directordaemon::NewDirectorJcr();
-
   auto result = db->FindLastJobStartTimeForJobAndClient(jcr, "backup-bareos-fd",
                                                         "bareos-fd", stime);