[Pkg-gnupg-commit] [libgpg-error] 04/15: Adjust memory limit of es_fopenmem to the block size.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libgpg-error.

commit baf4bcc0973c8b04bd760aaab0f4232c9354e203
Author: Werner Koch <wk at gnupg.org>
Date:   Sat May 28 11:27:45 2016 +0200

    Adjust memory limit of es_fopenmem to the block size.
    
    * src/estream.c (func_mem_create): Round up memory limit.
    --
    
    This is required so that giving a memory limit to es_fopenmem won't
    fail if it is below the block size.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/estream.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/estream.c b/src/estream.c
index 499cc75..2033b23 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -639,6 +639,14 @@ func_mem_create (void *_GPGRT__RESTRICT *_GPGRT__RESTRICT cookie,
       return -1;
     }
 
+  /* Round a memory limit up to the next block length.  */
+  if (memory_limit && block_size)
+    {
+      memory_limit += block_size - 1;
+      memory_limit /= block_size;
+      memory_limit *= block_size;
+    }
+
   mem_cookie = mem_alloc (sizeof (*mem_cookie));
   if (!mem_cookie)
     err = -1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git