From 6de04a3edd888acd7b9b55961cfb05439809ffd4 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 17 Apr 2020 10:53:47 +0200 Subject: [PATCH] CWE-478: Addition of missing default case in the Switch statement --- src/flabel.cpp | 1 + src/flineedit.cpp | 3 +++ src/flistbox.cpp | 2 ++ src/flistview.cpp | 4 ++++ src/fmenuitem.cpp | 1 + src/fmouse.cpp | 1 + src/fscrollview.cpp | 4 ++++ src/fspinbox.cpp | 1 + src/fterm.cpp | 5 +++++ src/ftextview.cpp | 2 ++ src/fvterm.cpp | 1 + src/fwidget.cpp | 7 +++++++ 12 files changed, 32 insertions(+) diff --git a/src/flabel.cpp b/src/flabel.cpp index 794b30ab..d44c7ad5 100644 --- a/src/flabel.cpp +++ b/src/flabel.cpp @@ -275,6 +275,7 @@ std::size_t FLabel::getAlignOffset (const std::size_t length) switch ( alignment ) { case fc::alignLeft: + default: return 0; case fc::alignCenter: diff --git a/src/flineedit.cpp b/src/flineedit.cpp index 46c857e5..478b16aa 100644 --- a/src/flineedit.cpp +++ b/src/flineedit.cpp @@ -635,6 +635,7 @@ void FLineEdit::adjustLabel() break; case label_left: + default: label->setGeometry ( FPoint(w->getX() - int(label_width) - 1, w->getY()) , FSize(label_width, 1) ); break; @@ -749,6 +750,7 @@ void FLineEdit::drawInputField() switch ( input_type ) { case FLineEdit::textfield: + default: return printTextField(); case FLineEdit::password: @@ -818,6 +820,7 @@ inline std::size_t FLineEdit::getCursorColumnPos() switch ( input_type ) { case FLineEdit::textfield: + default: return getColumnWidth (print_text, cursor_pos); case FLineEdit::password: diff --git a/src/flistbox.cpp b/src/flistbox.cpp index f2d27e2b..d2f558df 100644 --- a/src/flistbox.cpp +++ b/src/flistbox.cpp @@ -1758,6 +1758,7 @@ void FListBox::cb_vbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: @@ -1821,6 +1822,7 @@ void FListBox::cb_hbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: diff --git a/src/flistview.cpp b/src/flistview.cpp index 1369abab..64e0c55b 100644 --- a/src/flistview.cpp +++ b/src/flistview.cpp @@ -1018,6 +1018,7 @@ void FListView::sort() { case fc::unknown: case fc::by_name: + default: if ( sort_order == fc::ascending ) { sort (sortAscendingByName); @@ -1586,6 +1587,7 @@ std::size_t FListView::getAlignOffset ( const fc::text_alignment align switch ( align ) { case fc::alignLeft: + default: return 0; case fc::alignCenter: @@ -2857,6 +2859,7 @@ void FListView::cb_vbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: @@ -2916,6 +2919,7 @@ void FListView::cb_hbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp index 15c08747..4a52917a 100644 --- a/src/fmenuitem.cpp +++ b/src/fmenuitem.cpp @@ -672,6 +672,7 @@ void FMenuItem::passMouseEvent ( T widget, const FMouseEvent* ev break; case fc::MouseMove_Event: + default: widget->onMouseMove(_ev.get()); break; } diff --git a/src/fmouse.cpp b/src/fmouse.cpp index c9839d0f..175d1a21 100644 --- a/src/fmouse.cpp +++ b/src/fmouse.cpp @@ -183,6 +183,7 @@ inline FMouse* FMouse::createMouseObject (const mouse_type mt) switch ( mt ) { case none: + default: return nullptr; case gpm: diff --git a/src/fscrollview.cpp b/src/fscrollview.cpp index a73c325b..519e5826 100644 --- a/src/fscrollview.cpp +++ b/src/fscrollview.cpp @@ -793,6 +793,7 @@ void FScrollView::setHorizontalScrollBarVisibility() switch ( h_mode ) { case fc::Auto: + default: if ( getScrollWidth() > getViewportWidth() ) hbar->show(); else @@ -815,6 +816,7 @@ void FScrollView::setVerticalScrollBarVisibility() switch ( v_mode ) { case fc::Auto: + default: if ( getScrollHeight() > getViewportHeight() ) vbar->show(); else @@ -870,6 +872,7 @@ void FScrollView::cb_vbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: @@ -921,6 +924,7 @@ void FScrollView::cb_hbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: diff --git a/src/fspinbox.cpp b/src/fspinbox.cpp index f2885076..25e2ca61 100644 --- a/src/fspinbox.cpp +++ b/src/fspinbox.cpp @@ -294,6 +294,7 @@ void FSpinBox::onTimer (FTimerEvent*) break; case FSpinBox::noSpin: + default: break; } } diff --git a/src/fterm.cpp b/src/fterm.cpp index cf940cf2..50f81648 100644 --- a/src/fterm.cpp +++ b/src/fterm.cpp @@ -1090,6 +1090,7 @@ void FTerm::setEncoding (fc::encoding enc) case fc::ASCII: case fc::UNKNOWN: case fc::NUM_OF_ENCODINGS: + default: putchar() = &FTerm::putchar_ASCII; } @@ -2553,6 +2554,10 @@ void FTerm::signal_handler (int signum) << signum << " (" << strsignal(signum) << ")" << std::endl; std::terminate(); + break; + + default: + break; } } diff --git a/src/ftextview.cpp b/src/ftextview.cpp index 16647d2c..d04adfc3 100644 --- a/src/ftextview.cpp +++ b/src/ftextview.cpp @@ -758,6 +758,7 @@ void FTextView::cb_vbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: @@ -809,6 +810,7 @@ void FTextView::cb_hbarChange (const FWidget*, const FDataPtr) switch ( scrollType ) { case FScrollbar::noScroll: + default: break; case FScrollbar::scrollPageBackward: diff --git a/src/fvterm.cpp b/src/fvterm.cpp index e4e37a1d..e767229a 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -159,6 +159,7 @@ void FVTerm::setTerminalUpdates (terminal_update refresh_state) case continue_terminal_updates: case start_terminal_updates: + default: no_terminal_updates = false; } diff --git a/src/fwidget.cpp b/src/fwidget.cpp index fd1a3c35..9c5aa835 100644 --- a/src/fwidget.cpp +++ b/src/fwidget.cpp @@ -235,6 +235,7 @@ std::vector& FWidget::doubleFlatLine_ref (fc::sides side) return double_flatline_mask.bottom; case fc::left: + default: return double_flatline_mask.left; } @@ -665,6 +666,9 @@ void FWidget::setDoubleFlatLine (fc::sides side, bool bit) length = double_flatline_mask.left.size(); double_flatline_mask.left.assign(length, bit); break; + + default: + break; } } @@ -714,6 +718,9 @@ void FWidget::setDoubleFlatLine (fc::sides side, int pos, bool bit) double_flatline_mask.left[index] = bit; break; + + default: + break; } }