Prechádzať zdrojové kódy

LibGfx/TIFF: Don't include the null-byte terminator when reading strings

Lucas CHOLLET 1 rok pred
rodič
commit
0a80daef90

+ 3 - 0
Userland/Libraries/LibGfx/ImageFormats/TIFFLoader.cpp

@@ -378,6 +378,9 @@ private:
         case Type::ASCII:
         case Type::ASCII:
         case Type::UTF8: {
         case Type::UTF8: {
             Vector<Value, 1> result;
             Vector<Value, 1> result;
+            // NOTE: No need to include the null terminator
+            if (count > 0)
+                --count;
             auto string_data = TRY(ByteBuffer::create_uninitialized(count));
             auto string_data = TRY(ByteBuffer::create_uninitialized(count));
             TRY(m_stream->read_until_filled(string_data));
             TRY(m_stream->read_until_filled(string_data));
             result.empend(TRY(String::from_utf8(StringView { string_data.bytes() })));
             result.empend(TRY(String::from_utf8(StringView { string_data.bytes() })));