diff options
| author | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
|---|---|---|
| committer | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
| commit | eaa453335563d670d856da44bf4ea1f332c618a7 (patch) | |
| tree | a976bf3e0fc4b690042915745e637eb6b00929e4 /nGenEx | |
| parent | 035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff) | |
| download | starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.zip starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.gz starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.bz2 | |
Ensure check for NULL pointer occurs prior to use, not after
Diffstat (limited to 'nGenEx')
| -rw-r--r-- | nGenEx/Joystick.cpp | 4 | ||||
| -rw-r--r-- | nGenEx/ListBox.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nGenEx/Joystick.cpp b/nGenEx/Joystick.cpp index af11e69..97dc671 100644 --- a/nGenEx/Joystick.cpp +++ b/nGenEx/Joystick.cpp @@ -1,6 +1,6 @@ /* Project nGenEx
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: nGenEx.lib
FILE: Joystick.cpp
@@ -542,7 +542,7 @@ Joystick::Acquire() if (ndev < 1)
EnumerateDevices();
- if (CreateDevice(select))
+ if (CreateDevice(select) && pdev)
pdev->Acquire();
}
diff --git a/nGenEx/ListBox.cpp b/nGenEx/ListBox.cpp index 3af31cb..710bb95 100644 --- a/nGenEx/ListBox.cpp +++ b/nGenEx/ListBox.cpp @@ -1,6 +1,6 @@ /* Project nGenEx
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright � 1997-2004. All Rights Reserved.
SUBSYSTEM: nGenEx.lib
FILE: ListBox.cpp
@@ -83,10 +83,10 @@ public: int ListBoxItem::operator < (const ListBoxItem& item) const
{
- int sort_column = listbox->GetSortColumn() - 1;
- int sort_criteria = listbox->GetSortCriteria();
+ if (listbox && listbox == item.listbox) {
+ int sort_column = listbox->GetSortColumn() - 1;
+ int sort_criteria = listbox->GetSortCriteria();
- if (listbox && listbox == item.listbox) {
if (sort_column == -1) {
switch (sort_criteria) {
case ListBox::LIST_SORT_NUMERIC_DESCENDING:
@@ -130,10 +130,10 @@ int ListBoxItem::operator < (const ListBoxItem& item) const int ListBoxItem::operator <=(const ListBoxItem& item) const
{
- int sort_column = listbox->GetSortColumn() - 1;
- int sort_criteria = listbox->GetSortCriteria();
-
if (listbox && listbox == item.listbox) {
+ int sort_column = listbox->GetSortColumn() - 1;
+ int sort_criteria = listbox->GetSortCriteria();
+
if (sort_column == -1) {
switch (sort_criteria) {
case ListBox::LIST_SORT_NUMERIC_DESCENDING:
@@ -177,10 +177,10 @@ int ListBoxItem::operator <=(const ListBoxItem& item) const int ListBoxItem::operator == (const ListBoxItem& item) const
{
- int sort_column = listbox->GetSortColumn() - 1;
- int sort_criteria = listbox->GetSortCriteria();
-
if (listbox && listbox == item.listbox) {
+ int sort_column = listbox->GetSortColumn() - 1;
+ int sort_criteria = listbox->GetSortCriteria();
+
if (sort_column == -1) {
switch (sort_criteria) {
case ListBox::LIST_SORT_NUMERIC_DESCENDING:
|