From 067a44fcad9196c6ad8cc3b2f86261b78ae54f48 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Fri, 16 Feb 2018 03:46:28 +0000 Subject: Fix fallthroughs in XFA code. Change-Id: I1fd4bf85cd709de1c14ed2895d045018f79bc61f Reviewed-on: https://pdfium-review.googlesource.com/26950 Reviewed-by: dsinclair Commit-Queue: Henrique Nakashima --- core/fxcodec/bmp/cfx_bmpdecompressor.cpp | 2 ++ core/fxcodec/codec/ccodec_pngmodule.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'core/fxcodec') diff --git a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp index 0391258330..ea6e2ba0bb 100644 --- a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp +++ b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp @@ -205,12 +205,14 @@ int32_t CFX_BmpDecompressor::ReadHeader() { Error(); NOTREACHED(); } + break; } case 32: break; default: Error(); NOTREACHED(); + break; } src_row_bytes_ = BMP_WIDTHBYTES(width_, bit_counts_); switch (bit_counts_) { diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index 37e83f7248..db5886aa29 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -10,6 +10,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" +#include "core/fxcrt/fx_fallthrough.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" @@ -155,6 +156,7 @@ static void _png_get_header_func(png_structp png_ptr, png_infop info_ptr) { if (color_type1 != PNG_COLOR_TYPE_PALETTE) { png_error(pContext->m_pPng, "Not Support Output Palette Now"); } + FX_FALLTHROUGH; case PNG_COLOR_TYPE_RGB: case PNG_COLOR_TYPE_RGB_ALPHA: if (!(color_type1 & PNG_COLOR_MASK_COLOR)) { -- cgit v1.2.3