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
@@ -15,81 +15,83 @@
 #ifndef USEQPE
 #include <qapplication.h>
 #else /* USEQPE */
 #include <qpe/qpeapplication.h>
 #endif /* USEQPE */
 #include <qimage.h>
 
 #include "plucker_base.h"
 #include "Aportis.h"
 #include "hrule.h"
 #include "decompress.h"
 
 const UInt8 CPlucker_base::continuation_bit = 1;
 
 CPlucker_base::CPlucker_base() :
 #ifdef LOCALPICTURES
   m_viewer(NULL),
   m_picture(NULL),
 #endif
   expandedtextbuffer(NULL),
   compressedtextbuffer(NULL),
   bufferrec(-1),
   m_offset(0)
   //,    urls(NULL)
 { /*printf("constructing:%x\n",fin);*/ }
 
 
 void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buffersize)
 {
 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;
       if (reclen > compressedbuffersize)
 	{
 	  readbuffer = new UInt8[reclen];
 	}
       else
 	{
 	  readbuffer = compressedtextbuffer;
 	}
       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;
 	    }
 	}
     }
 }
 
 void CPlucker_base::sizes(unsigned long& _file, unsigned long& _text)
 {
   _file = file_length;
   if (textlength == 0)
     {
       for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
 	{
 	  gotorecordnumber(recptr);
 	  UInt16 thishdr_uid, thishdr_nParagraphs;
 	  UInt32 thishdr_size;
 	  UInt8 thishdr_type, thishdr_reserved;
 	  GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
 	  if (thishdr_type < 2) textlength += thishdr_size;
 	}
     }
   _text = textlength;
   //ntohl(hdr0.size);
 }
 
 char* CPlucker_base::geturl(UInt16 tgt)
 {
   char * pRet = NULL;
   gotorecordnumber(0);
   fread(&hdr0, 1, 6, fin);