From d87df8cd41183df3cfb3e389208a8de0ba70aed1 Mon Sep 17 00:00:00 2001 From: hvlad Date: Mon, 25 Jun 2018 01:35:30 +0300 Subject: [PATCH] Fixed crash when no object for grant\revoke operation. Roman, please review. --- src/dsql/DdlNodes.epp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp index 3b30f68045..f7830d5bcb 100644 --- a/src/dsql/DdlNodes.epp +++ b/src/dsql/DdlNodes.epp @@ -11084,7 +11084,7 @@ void GrantRevokeNode::grantRevoke(thread_db* tdbb, jrd_tra* transaction, const G MetaName user(userNod->second); MetaName dummyName; const SSHORT objType = object ? object->first : obj_type_MAX; - const MetaName objName(object->second); + const MetaName objName(object ? object->second : ""); bool crdb = false; char privileges[16]; @@ -11221,7 +11221,7 @@ void GrantRevokeNode::grantRevoke(thread_db* tdbb, jrd_tra* transaction, const G break; default: - fb_assert(false); + fb_assert(object == NULL); } if (options == 1) // with grant option