SF.net SVN: mahogany:[7521] trunk/M/src/modules/crypt/PGPEngine.cpp

Revision: 7521
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7521&view=rev
Author:   vadz
Date:     2008-08-06 00:27:32 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
and now fix the crash caused by the last fix to message signing

Modified Paths:
--------------
    trunk/M/src/modules/crypt/PGPEngine.cpp

Modified: trunk/M/src/modules/crypt/PGPEngine.cpp
===================================================================
--- trunk/M/src/modules/crypt/PGPEngine.cpp	2008-08-05 23:26:50 UTC (rev 7520)
+++ trunk/M/src/modules/crypt/PGPEngine.cpp	2008-08-06 00:27:32 UTC (rev 7521)
@@ -348,11 +348,6 @@
          lenIn -= lenChunk;
          ptrIn += lenChunk;
       }
-      else if ( !lenIn )
-      {
-         process.CloseOutput();
-         in = NULL;
-      }
 
       if ( err->GetLastError() == wxSTREAM_EOF )
       {
@@ -634,6 +629,10 @@
                // these codes indicate that we don't need to send anything more
                // to GPG, check that we did send everything
                ASSERT_MSG( !lenIn, "should have sent everything by now" );
+
+               // and close the input stream as we have nothing more to send
+               process.CloseOutput();
+               in = NULL;
             }
             else if ( code == _T("ENC_TO") ||
                       code == _T("BEGIN_DECRYPTION") ||


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/