[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.16-31-gabceb05

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  abceb05d5432dcb25e25db908b1ce55ad964cf9e (commit)
      from  846d5744078bef2d781c0847cd5686f8c5016b40 (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 abceb05d5432dcb25e25db908b1ce55ad964cf9e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 20 15:49:20 2011 +0100

    Fix a bug in es_fopenmem etc.

diff --git a/common/ChangeLog b/common/ChangeLog
index eb1f22e..7025966 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,6 +1,10 @@
+2011-01-20  Werner Koch  <wk at g10code.com>
+
+	* estream.c (es_func_mem_write): Fix computation of NEWSIZE.
+
 2011-01-11  Werner Koch  <wk at g10code.com>
 
-        Estream changes as used gnupg master from 2010-07-19.
+        Estream changes as used by gnupg master from 2010-07-19.
 
 	* estream.c (es_fname_get, es_fname_set): New.
 	(fname_set_internal): New.
diff --git a/common/estream.c b/common/estream.c
index 3ab68b5..9f7dfd0 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -497,7 +497,7 @@ typedef struct estream_cookie_mem
 
 
 /* Create function for memory objects.  DATA is either NULL or a user
-   supplied buffer with the initial conetnt of the memory buffer.  If
+   supplied buffer with the initial content of the memory buffer.  If
    DATA is NULL, DATA_N and DATA_LEN need to be 0 as well.  If DATA is
    not NULL, DATA_N gives the allocated size of DATA and DATA_LEN the
    used length in DATA.  */
@@ -596,7 +596,7 @@ es_func_mem_write (void *cookie, const void *buffer, size_t size)
       if (!mem_cookie->memory_size)
         newsize = size;  /* Not yet allocated.  */
       else
-        newsize = mem_cookie->memory_size + (nleft - size);
+        newsize = mem_cookie->memory_size + (size - nleft);
       if (newsize < mem_cookie->offset)
         {
           _set_errno (EINVAL);

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

Summary of changes:
 common/ChangeLog |    6 +++++-
 common/estream.c |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org