The Expand call does not check for null termination of the URL strings

that it is expanding. Since strlen() is used with the URLs after Expand
is used, it is good idea to make sure that Expand terminates the strings.

This commit changes that so that the URL strings are guaranteed to be
terminated after expansion.

1 files changed, 4 insertions, 2 deletions

diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index 81614f5..849edfc 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -43,9 +43,10 @@ void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buff
 {
 unsuspend();
   if ((type%2 == 0) && (type != 14))
     {
-      fread(buffer, reclen, sizeof(char), fin);
+      size_t bytes_read = fread(buffer, reclen, sizeof(char), fin);
+      buffer[bytes_read] = '\0';
     }
   else
     {
       UInt8* readbuffer = NULL;
@@ -59,9 +60,10 @@ unsuspend();
 	}
       if (readbuffer != NULL)
 	{
 	  fread(readbuffer, reclen, sizeof(char), fin);
-	  (*m_decompress)(readbuffer, reclen, buffer, buffersize);
+	  size_t bytes_read = (*m_decompress)(readbuffer, reclen, buffer, buffersize);
+	  buffer[bytes_read] = '\0';
 	  if (reclen > compressedbuffersize)
 	    {
 	      delete [] readbuffer;
 	    }