[cmake-commits] hoffman committed cmCPackTarCompressGenerator.cxx 1.3.2.4 1.3.2.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv9830/Source/CPack

Modified Files:
      Tag: CMake-2-4
	cmCPackTarCompressGenerator.cxx 
Log Message:
ENH: merge in changes from main tree


Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- cmCPackTarCompressGenerator.cxx	30 Oct 2006 16:36:07 -0000	1.3.2.4
+++ cmCPackTarCompressGenerator.cxx	17 May 2007 18:41:52 -0000	1.3.2.5
@@ -225,15 +225,18 @@
 int cmCPackTarCompress_Compress_Output(void* client_data,
   const char* data, int data_length)
 {
+  if(!client_data)
+    {
+    return 0;
+    }
   cmcompress_stream *cstream = static_cast<cmcompress_stream*>(client_data);
   cmCPackTarCompress_Data *mydata
     = static_cast<cmCPackTarCompress_Data*>(cstream->client_data);
-  mydata->OutputStream->write(data, data_length);
-
   if ( !mydata->OutputStream )
     {
     return 0;
     }
+  mydata->OutputStream->write(data, data_length);
   return data_length;
 }