[git] GpgOL - branch, mime-addin, updated. gpgol-1.2.0-35-gfdbeb6f

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, mime-addin has been updated
       via  fdbeb6fbb026b750bc36bfb97c52697e645bd0e1 (commit)
       via  560cea7e5bbf7f0404e4f1977b42710245f26b1f (commit)
       via  cda3411314722326816026b96c858160f8980e7b (commit)
      from  3674e1868412eb48576267a01cab522ffd327f4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fdbeb6fbb026b750bc36bfb97c52697e645bd0e1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Sep 30 18:19:39 2015 +0200

    Update attachment size after modification
    
    * src/attachment.cpp (do_crypt_stream): Set stream size after modify.
    
    --
    When encrypting this was no problem but on decryption the last
    16 Bytes (Size of the Header) would still be included in the
    resulting file.

diff --git a/src/attachment.cpp b/src/attachment.cpp
index 9ecd970..b7e7102 100644
--- a/src/attachment.cpp
+++ b/src/attachment.cpp
@@ -77,6 +77,7 @@ do_crypt_stream (LPSTREAM stream, symenc_t symenc, bool encrypt)
      at 16 because of the GpgOL message. */
   LARGE_INTEGER readpos = {0},
                 writepos = {0};
+  ULARGE_INTEGER new_size = {0};
 
   if (!encrypt)
     {
@@ -128,6 +129,14 @@ do_crypt_stream (LPSTREAM stream, symenc_t symenc, bool encrypt)
         stream->Seek(readpos, STREAM_SEEK_SET, NULL);
       }
     while (nread == COPYBUFFERSIZE);
+
+  new_size.QuadPart = writepos.QuadPart;
+  hr = stream->SetSize (new_size);
+  if (FAILED (hr))
+    {
+      log_error ("%s:%s: Failed to update size", SRCNAME, __func__);
+      goto done;
+    }
   rc = 0;
 
 done:

commit 560cea7e5bbf7f0404e4f1977b42710245f26b1f
Merge: 3674e18 cda3411
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 28 16:24:18 2015 +0200

    Merge branch 'master' into mime-addin


-----------------------------------------------------------------------

Summary of changes:
 src/attachment.cpp | 9 +++++++++
 src/gpgoladdin.cpp | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org