[poppler] poppler/PageLabelInfo_p.h

[GitLab Mirror]

 poppler/PageLabelInfo_p.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 306df53be898aaebdbd5cd99947e4baef54ac1eb
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Nov 28 20:59:25 2020 +0100

    Fix abort when searching for "bad" label names
    
    Give wstring_convert a error string so it does throw an exception when
    it fails
    
    oss-fuzz/28002

diff --git a/poppler/PageLabelInfo_p.h b/poppler/PageLabelInfo_p.h
index 7fe2090f..ada3b0f7 100644
--- a/poppler/PageLabelInfo_p.h
+++ b/poppler/PageLabelInfo_p.h
@@ -3,7 +3,7 @@
 // This file is under the GPLv2 or later license
 //
 // Copyright (C) 2005-2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005, 2009, 2014, 2019 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2009, 2014, 2019, 2020 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2011 Simon Kellner <kellner at kit.edu>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2018 Adam Reichold <adam.reichold at t-online.de>
@@ -33,7 +33,7 @@ static std::pair<int, bool> fromDecimal(const char *const begin, const char *con
 {
 #ifdef HAVE_CODECVT
     if (unicode) {
-        std::wstring_convert<std::codecvt_utf16<wchar_t>> converter;
+        std::wstring_convert<std::codecvt_utf16<wchar_t>> converter("", L"");
         const auto str = converter.from_bytes(begin, end);
 
         // Skip BOM since wcstol seems unable to handle it.