From Murai Takashi <tmurai01@xxxxxxxxx>:
Murai Takashi has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3492 ;)
Change subject: fontdemo: Fix null pointer dereference
......................................................................
fontdemo: Fix null pointer dereference
Fix possible null pointer dereference at line 314
when 'submenu' is NULL at line 297.
Pointed out by cppcheck.
Change-Id: I054f63d574f4a9608df49d48ee74b87cd0116f69
---
M src/apps/fontdemo/ControlView.cpp
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/92/3492/1
diff --git a/src/apps/fontdemo/ControlView.cpp
b/src/apps/fontdemo/ControlView.cpp
index 230f3ae..dddb7d8 100644
--- a/src/apps/fontdemo/ControlView.cpp
+++ b/src/apps/fontdemo/ControlView.cpp
@@ -294,10 +294,12 @@
const_cast<char*>(currentFamilyItem->Label()));
BMenu* submenu = currentFamilyItem->Submenu();
- if (submenu) {
- BMenuItem* markedStyle =
submenu->FindMarked();
- fFontStyleindex =
submenu->IndexOf(markedStyle);
+ if (submenu == NULL) {
+ printf("Failed to get style.\n");
+ return;
}
+ BMenuItem* markedStyle = submenu->FindMarked();
+ fFontStyleindex = submenu->IndexOf(markedStyle);
if (fFontStyleindex < installedStyles - 1)
fFontStyleindex++;
--
To view, visit https://review.haiku-os.org/c/haiku/+/3492
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I054f63d574f4a9608df49d48ee74b87cd0116f69
Gerrit-Change-Number: 3492
Gerrit-PatchSet: 1
Gerrit-Owner: Murai Takashi <tmurai01@xxxxxxxxx>
Gerrit-MessageType: newchange
