diff options
| author | Jeremy Allison <jra@samba.org> | 2013-08-27 12:43:50 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-03-15 22:13:08 +0100 |
| commit | 622fecba75d53a8c9c85602da0a09d2011cfb422 (patch) | |
| tree | f0ffe0439ede9ca239bc82d2cc749310e164f264 /lib | |
| parent | fd0122cc72d161f6b67d3f505e7bd6871445072d (diff) | |
| download | samba-622fecba75d53a8c9c85602da0a09d2011cfb422.tar.gz | |
Remove magic TC_HDR_SIZE handling inside talloc_memlimit_check().
Callers already account for TC_HDR_SIZE, do not add it twice.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
(cherry picked from commit 7a6beae68ee3f9a97e9e56f4e24a437839fb3e19)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/talloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 067d46f97d3..7b827ca0c15 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -2561,7 +2561,7 @@ static bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size) for (l = limit; l != NULL; l = l->upper) { if (l->max_size != 0 && ((l->max_size <= l->cur_size) || - (l->max_size - l->cur_size < TC_HDR_SIZE+size))) { + (l->max_size - l->cur_size < size))) { return false; } } |