diff options
| author | Park Kyoung Won <kw0712.park@samsung.com> | 2017-08-21 20:38:00 +0900 |
|---|---|---|
| committer | 황석연/L4/프로/개발플랫폼팀/에스코어 <syeon-hwang@users.noreply.github.sec.samsung.net> | 2017-08-22 11:49:15 +0900 |
| commit | ebc4ca272a58fb3549d0a5e5204cfe4316da205c (patch) | |
| tree | 2a8a920491d4ed9cf2e41dbd61f1e122d904f309 | |
| parent | 7fd95aa5757d1fc2da03b2a03ec2b0aec001a016 (diff) | |
| download | emulator-control-panel-devices-ebc4ca272a58fb3549d0a5e5204cfe4316da205c.tar.gz emulator-control-panel-devices-ebc4ca272a58fb3549d0a5e5204cfe4316da205c.tar.bz2 emulator-control-panel-devices-ebc4ca272a58fb3549d0a5e5204cfe4316da205c.zip | |
svace: fix bug
- check dereferenced null pointer.
Signed-off-by: Park Kyoung Won <kw0712.park@samsung.com>
3 files changed, 6 insertions, 4 deletions
diff --git a/ECP-DEVICES/src/org/tizen/ecp/network/ui/NetworkController.java b/ECP-DEVICES/src/org/tizen/ecp/network/ui/NetworkController.java index d4ba3cd..c38749d 100644 --- a/ECP-DEVICES/src/org/tizen/ecp/network/ui/NetworkController.java +++ b/ECP-DEVICES/src/org/tizen/ecp/network/ui/NetworkController.java @@ -161,9 +161,9 @@ public class NetworkController implements Initializable { private String checkPorts(PORT_TYPE port) { String portNum = ""; - if (port == PORT_TYPE.SOURCE_PORT) { + if (port == PORT_TYPE.SOURCE_PORT && fx_sPort_textfield != null) { portNum = fx_sPort_textfield.getText(); - } else if (port == PORT_TYPE.DESTINATION_PORT) { + } else if (port == PORT_TYPE.DESTINATION_PORT && fx_dPort_textfield != null) { portNum = fx_dPort_textfield.getText(); } diff --git a/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/NFCController.java b/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/NFCController.java index 456e377..866b0a5 100644 --- a/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/NFCController.java +++ b/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/NFCController.java @@ -543,7 +543,7 @@ public class NFCController implements Initializable { } } - if (idText.getText().isEmpty() == true) { + if (idText.getText() == null || idText.getText().isEmpty() == true) { record.setId(NFCConstants.NULL); } else { record.setId(idText.getText()); diff --git a/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/TizenRemoteFileDialog.java b/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/TizenRemoteFileDialog.java index dcb69df..5f14d2d 100644 --- a/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/TizenRemoteFileDialog.java +++ b/ECP-DEVICES/src/org/tizen/ecp/nfc/ui/TizenRemoteFileDialog.java @@ -138,7 +138,9 @@ public class TizenRemoteFileDialog { if (dialog.getDialogPane() != null) { dialog.getDialogPane().setContent(makeContent()); } - okButton.setDisable(true); + if (okButton != null) { + okButton.setDisable(true); + } return dialog.showAndWait(); } |