diff options
Diffstat (limited to 'core/fxge/cfx_folderfontinfo.cpp')
-rw-r--r-- | core/fxge/cfx_folderfontinfo.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/core/fxge/cfx_folderfontinfo.cpp b/core/fxge/cfx_folderfontinfo.cpp index 532824d248..b39c57637f 100644 --- a/core/fxge/cfx_folderfontinfo.cpp +++ b/core/fxge/cfx_folderfontinfo.cpp @@ -44,11 +44,15 @@ const struct { }; ByteString FPDF_ReadStringFromFile(FILE* pFile, uint32_t size) { - ByteString buffer; - if (!fread(buffer.GetBuffer(size), size, 1, pFile)) - return ByteString(); - buffer.ReleaseBuffer(size); - return buffer; + ByteString result; + { + // Span's lifetime must end before ReleaseBuffer() below. + pdfium::span<char> buffer = result.GetBuffer(size); + if (!fread(buffer.data(), size, 1, pFile)) + return ByteString(); + } + result.ReleaseBuffer(size); + return result; } ByteString FPDF_LoadTableFromTT(FILE* pFile, |