From d230ec0df816b56b902bb0d2f5edfbaac0aea95d Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 27 Dec 2019 15:04:18 +0300
Subject: [PATCH] #4967 Metadata editor: check for empty object names

Former-commit-id: eb80f24ccae1bcc15108d025e59e12ba3fccd328
---
 .../dbeaver/model/impl/sql/edit/SQLObjectEditor.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
index 26f1709766..747d19bbd8 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
@@ -328,11 +328,15 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
         public void validateCommand(DBRProgressMonitor monitor, Map<String, Object> options) throws DBException {
             OBJECT_TYPE newObject = getObject();
             if (!newObject.isPersisted()) {
+                String objectName = newObject.getName();
+                if (CommonUtils.isEmpty(objectName)) {
+                    throw new DBException("Empty object name");
+                }
                 DBSObjectCache<? extends DBSObject, OBJECT_TYPE> objectsCache = getObjectsCache(newObject);
                 if (objectsCache != null) {
-                    OBJECT_TYPE cachedObject = DBUtils.findObject(objectsCache.getCachedObjects(), newObject.getName());
+                    OBJECT_TYPE cachedObject = DBUtils.findObject(objectsCache.getCachedObjects(), objectName);
                     if (cachedObject != null && cachedObject != newObject) {
-                        throw new DBException("Object '" + newObject.getName() + "' already exists");
+                        throw new DBException("Object '" + objectName + "' already exists");
                     }
                 }
             }
-- 
GitLab