onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-11 03:24:57 +02:00
Code Issues Releases Wiki Activity

fix: Handle nullptr when adding object

Browse Source 
Github: fixes 50
This commit is contained in:
Sirius Bakke
2019-02-21 00:53:15 -03:00
parent 7d3adbad10
commit 3bbce178e2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libgui/ObjectManipulator_create_new.cpp
View File

@@ -464,7 +464,7 @@ FWObject* ObjectManipulator::newLibrary(QUndoCommand* macro)
FWObject* ObjectManipulator::newPolicyRuleSet(QUndoCommand* macro) FWObject* ObjectManipulator::newPolicyRuleSet(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
QString name = "Policy"; QString name = "Policy";
Firewall * fw = Firewall::cast(currentObj); Firewall * fw = Firewall::cast(currentObj);
if (fw!=NULL) if (fw!=NULL)
@@ -486,7 +486,7 @@ FWObject* ObjectManipulator::newPolicyRuleSet(QUndoCommand* macro)
FWObject* ObjectManipulator::newNATRuleSet(QUndoCommand* macro) FWObject* ObjectManipulator::newNATRuleSet(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
QString name = "NAT"; QString name = "NAT";
Firewall * fw = Firewall::cast(currentObj); Firewall * fw = Firewall::cast(currentObj);
if (fw!=NULL) if (fw!=NULL)
@@ -609,7 +609,7 @@ void ObjectManipulator::newClusterFromSelected()
FWObject* ObjectManipulator::newClusterIface(QUndoCommand* macro) FWObject* ObjectManipulator::newClusterIface(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
QString new_name = makeNameUnique(currentObj, QString new_name = makeNameUnique(currentObj,
findNewestInterfaceName(currentObj), findNewestInterfaceName(currentObj),
Interface::TYPENAME); Interface::TYPENAME);
@@ -624,7 +624,7 @@ FWObject* ObjectManipulator::newClusterIface(QUndoCommand* macro)
FWObject* ObjectManipulator::newStateSyncClusterGroup(QUndoCommand* macro) FWObject* ObjectManipulator::newStateSyncClusterGroup(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
FWObject *o = NULL; FWObject *o = NULL;
@@ -661,7 +661,7 @@ FWObject* ObjectManipulator::newStateSyncClusterGroup(QUndoCommand* macro)
FWObject* ObjectManipulator::newFailoverClusterGroup(QUndoCommand* macro) FWObject* ObjectManipulator::newFailoverClusterGroup(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
FWObject *o = NULL; FWObject *o = NULL;
@@ -688,7 +688,7 @@ FWObject* ObjectManipulator::newFailoverClusterGroup(QUndoCommand* macro)
FWObject* ObjectManipulator::newAttachedNetworks(QUndoCommand* macro) FWObject* ObjectManipulator::newAttachedNetworks(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
if (Interface::isA(currentObj)) if (Interface::isA(currentObj))
{ {
@@ -750,7 +750,7 @@ QString ObjectManipulator::findNewestInterfaceName(FWObject *parent)
FWObject* ObjectManipulator::newInterface(QUndoCommand* macro) FWObject* ObjectManipulator::newInterface(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
Interface *new_interface = NULL; Interface *new_interface = NULL;
FWObject *parent = NULL; FWObject *parent = NULL;
@@ -808,7 +808,7 @@ FWObject* ObjectManipulator::newInterface(QUndoCommand* macro)
FWObject* ObjectManipulator::newInterfaceAddress(QUndoCommand* macro) FWObject* ObjectManipulator::newInterfaceAddress(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
if (Interface::isA(currentObj)) if (Interface::isA(currentObj))
{ {
@@ -829,7 +829,7 @@ FWObject* ObjectManipulator::newInterfaceAddress(QUndoCommand* macro)
FWObject* ObjectManipulator::newInterfaceAddressIPv6(QUndoCommand* macro) FWObject* ObjectManipulator::newInterfaceAddressIPv6(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
if (Interface::isA(currentObj)) if (Interface::isA(currentObj))
{ {
@@ -850,7 +850,7 @@ FWObject* ObjectManipulator::newInterfaceAddressIPv6(QUndoCommand* macro)
FWObject* ObjectManipulator::newPhysicalAddress(QUndoCommand* macro) FWObject* ObjectManipulator::newPhysicalAddress(QUndoCommand* macro)
{ {
FWObject *currentObj = getSelectedObject(); FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL; if ( !currentObj || currentObj->isReadOnly() ) return NULL;
if (Interface::isA(currentObj)) if (Interface::isA(currentObj))
{ {