Merge branch 'mysql-8.4' into mysql-trunk

zmur · zmur · commit af14baff9d12 · 2024-04-10T09:16:27.000+02:00
Change-Id: Ic0918fa53fbf261a01328ebfe72d822f7336765a
diff --git a/storage/ndb/src/common/mgmcommon/ConfigObject.cpp b/storage/ndb/src/common/mgmcommon/ConfigObject.cpp
@@ -108,6 +108,7 @@ ConfigObject *ConfigObject::copy_current(ConfigSection *curr_section) const {
   if (new_cs == nullptr) {
     DEB_MALLOC(("delete(%u) => %p", __LINE__, new_co));
     delete new_co;
+    return nullptr;
   }
   new_co->m_cfg_sections.push_back(new_cs);
   new_co->m_num_sections = 1;
@@ -164,6 +165,8 @@ ConfigObject *ConfigObject::copy_current(ConfigSection *curr_section) const {
       break;
     }
     default: {
+      DEB_MALLOC(("delete(%u) => %p", __LINE__, new_co));
+      delete new_co;
       return nullptr;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ ConfigObject ConfigObject::copy_current(ConfigSection curr_section) const {`
`108`	`108`	`if (new_cs == nullptr) {`
`109`	`109`	`DEB_MALLOC(("delete(%u) => %p", __LINE__, new_co));`
`110`	`110`	`delete new_co;`
	`111`	`+ return nullptr;`
`111`	`112`	`}`
`112`	`113`	`new_co->m_cfg_sections.push_back(new_cs);`
`113`	`114`	`new_co->m_num_sections = 1;`
`@@ -164,6 +165,8 @@ ConfigObject ConfigObject::copy_current(ConfigSection curr_section) const {`
`164`	`165`	`break;`
`165`	`166`	`}`
`166`	`167`	`default: {`
	`168`	`+ DEB_MALLOC(("delete(%u) => %p", __LINE__, new_co));`
	`169`	`+ delete new_co;`
`167`	`170`	`return nullptr;`
`168`	`171`	`}`
`169`	`172`	`}`