desktop/source/lib/init.cxx | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 098fb95772b3184bb81180d1bc30c9753d30e2b6 Author: Henry Castro <hcas...@collabora.com> Date: Tue Nov 29 17:19:00 2016 -0400
lok: ensure positive values for width and height also check the pointer memory block allocated Change-Id: I0ded04e06f80400e64c5e58126a32ee503aeb394 Reviewed-on: https://gerrit.libreoffice.org/31388 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index fa3446e..fe73f17 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2592,8 +2592,13 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, *pFontWidth = nFontWidth; int nFontHeight = aRect.BottomRight().Y() + 1; *pFontHeight = nFontHeight; + if (!(nFontWidth > 0 && nFontHeight > 0)) + break; unsigned char* pBuffer = static_cast<unsigned char*>(malloc(4 * nFontWidth * nFontHeight)); + if (!pBuffer) + break; + memset(pBuffer, 0, nFontWidth * nFontHeight * 4); aDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits