fix possible segfault

zvonand · zvonand · commit fa81315a1b09 · 2026-02-19T15:47:40.000+01:00
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
@@ -608,18 +608,27 @@ class TablesBlockSource : public ISource
                 if (columns_mask[src_index++])
                 {
                     bool inserted = false;
-                    // Extract from specific DataLake metadata if suitable
-                    if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))
+
+                    try
                     {
-                        if (auto * dl_meta = obj->getExternalMetadata(context))
+                        // Extract from specific DataLake metadata if suitable
+                        if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))
                         {
-                            if (auto p = dl_meta->partitionKey(context); p.has_value())
+                            if (auto * dl_meta = obj->getExternalMetadata(context))
                             {
-                                res_columns[res_index++]->insert(*p);
-                                inserted = true;
+                                if (auto p = dl_meta->partitionKey(context); p.has_value())
+                                {
+                                    res_columns[res_index++]->insert(*p);
+                                    inserted = true;
+                                }
                             }
-                        }
 
+                        }
+                    }
+                    catch (const Exception &)
+                    {
+                        /// Failed to get info. It's not critical, just log it.
+                        tryLogCurrentException("StorageSystemTables");
                     }
 
                     if (!inserted)
@@ -635,18 +644,26 @@ class TablesBlockSource : public ISource
                 {
                     bool inserted = false;
 
-                    // Extract from specific DataLake metadata if suitable
-                    if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))
+                    try
                     {
-                        if (auto * dl_meta = obj->getExternalMetadata(context))
+                        // Extract from specific DataLake metadata if suitable
+                        if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))
                         {
-                            if (auto p = dl_meta->sortingKey(context); p.has_value())
+                            if (auto * dl_meta = obj->getExternalMetadata(context))
                             {
-                                res_columns[res_index++]->insert(*p);
-                                inserted = true;
+                                if (auto p = dl_meta->sortingKey(context); p.has_value())
+                                {
+                                    res_columns[res_index++]->insert(*p);
+                                    inserted = true;
+                                }
                             }
                         }
                     }
+                    catch (const Exception &)
+                    {
+                        /// Failed to get info. It's not critical, just log it.
+                        tryLogCurrentException("StorageSystemTables");
+                    }
 
                     if (!inserted)
                     {

Original file line number	Diff line number	Diff line change
`@@ -608,18 +608,27 @@ class TablesBlockSource : public ISource`
`608`	`608`	`if (columns_mask[src_index++])`
`609`	`609`	`{`
`610`	`610`	`bool inserted = false;`
`611`		`- // Extract from specific DataLake metadata if suitable`
`612`		`- if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))`
	`611`	`+`
	`612`	`+ try`
`613`	`613`	`{`
`614`		`- if (auto * dl_meta = obj->getExternalMetadata(context))`
	`614`	`+ // Extract from specific DataLake metadata if suitable`
	`615`	`+ if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))`
`615`	`616`	`{`
`616`		`- if (auto p = dl_meta->partitionKey(context); p.has_value())`
	`617`	`+ if (auto * dl_meta = obj->getExternalMetadata(context))`
`617`	`618`	`{`
`618`		`- res_columns[res_index++]->insert(*p);`
`619`		`- inserted = true;`
	`619`	`+ if (auto p = dl_meta->partitionKey(context); p.has_value())`
	`620`	`+ {`
	`621`	`+ res_columns[res_index++]->insert(*p);`
	`622`	`+ inserted = true;`
	`623`	`+ }`
`620`	`624`	`}`
`621`		`- }`
`622`	`625`
	`626`	`+ }`
	`627`	`+ }`
	`628`	`+ catch (const Exception &)`
	`629`	`+ {`
	`630`	`+ /// Failed to get info. It's not critical, just log it.`
	`631`	`+ tryLogCurrentException("StorageSystemTables");`
`623`	`632`	`}`
`624`	`633`
`625`	`634`	`if (!inserted)`
`@@ -635,18 +644,26 @@ class TablesBlockSource : public ISource`
`635`	`644`	`{`
`636`	`645`	`bool inserted = false;`
`637`	`646`
`638`		`- // Extract from specific DataLake metadata if suitable`
`639`		`- if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))`
	`647`	`+ try`
`640`	`648`	`{`
`641`		`- if (auto * dl_meta = obj->getExternalMetadata(context))`
	`649`	`+ // Extract from specific DataLake metadata if suitable`
	`650`	`+ if (auto * obj = dynamic_cast<StorageObjectStorage *>(table.get()))`
`642`	`651`	`{`
`643`		`- if (auto p = dl_meta->sortingKey(context); p.has_value())`
	`652`	`+ if (auto * dl_meta = obj->getExternalMetadata(context))`
`644`	`653`	`{`
`645`		`- res_columns[res_index++]->insert(*p);`
`646`		`- inserted = true;`
	`654`	`+ if (auto p = dl_meta->sortingKey(context); p.has_value())`
	`655`	`+ {`
	`656`	`+ res_columns[res_index++]->insert(*p);`
	`657`	`+ inserted = true;`
	`658`	`+ }`
`647`	`659`	`}`
`648`	`660`	`}`
`649`	`661`	`}`
	`662`	`+ catch (const Exception &)`
	`663`	`+ {`
	`664`	`+ /// Failed to get info. It's not critical, just log it.`
	`665`	`+ tryLogCurrentException("StorageSystemTables");`
	`666`	`+ }`
`650`	`667`
`651`	`668`	`if (!inserted)`
`652`	`669`	`{`