diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-11-01 00:08:55 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-11-01 00:08:55 +0000 |
| commit | 630bea5482d7796698298fb86bcea28c63397ce7 (patch) | |
| tree | 6abb504303ddda59d50c734cf1993f16064f7c10 /lib/libc | |
| parent | a5ebaed47359be9a8e5b8bdcf2f482e7d852c5aa (diff) | |
Two minor bug fixes rotting in my tree:
(1) When the second malloc in yp_next fails, do not leak the memory
allocated by the first one. Same fix as yp_first.c rev. 1.9.
(2) When compiled with YPMATCHCACHE, do not fail the lookup when
reserving memory for the cache fails. Instead, just return the
correct result without caching it.
ok millert@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/yp/ypmatch_cache.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/libc/yp/ypmatch_cache.c b/lib/libc/yp/ypmatch_cache.c index 09655eb2fb3..2f8d508c459 100644 --- a/lib/libc/yp/ypmatch_cache.c +++ b/lib/libc/yp/ypmatch_cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypmatch_cache.c,v 1.14 2009/06/06 18:28:09 schwarze Exp $ */ +/* $OpenBSD: ypmatch_cache.c,v 1.15 2009/11/01 00:08:54 schwarze Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com> * All rights reserved. @@ -200,9 +200,8 @@ again: (*outval)[*outvallen] = '\0'; #ifdef YPMATCHCACHE if (strcmp(_yp_domain, indomain) == 0) - if (!ypmatch_add(inmap, inkey, inkeylen, - *outval, *outvallen)) - r = YPERR_RESRC; + (void)ypmatch_add(inmap, inkey, inkeylen, + *outval, *outvallen); #endif } out: @@ -253,16 +252,14 @@ again: } if (!(r = ypprot_err(yprkv.stat))) { *outkeylen = yprkv.key.keydat_len; - if ((*outkey = malloc(*outkeylen + 1)) == NULL) + *outvallen = yprkv.val.valdat_len; + if ((*outkey = malloc(*outkeylen + 1)) == NULL || + (*outval = malloc(*outvallen + 1)) == NULL) { + free(*outkey); r = YPERR_RESRC; - else { + } else { (void)memcpy(*outkey, yprkv.key.keydat_val, *outkeylen); (*outkey)[*outkeylen] = '\0'; - } - *outvallen = yprkv.val.valdat_len; - if ((*outval = malloc(*outvallen + 1)) == NULL) - r = YPERR_RESRC; - else { (void)memcpy(*outval, yprkv.val.valdat_val, *outvallen); (*outval)[*outvallen] = '\0'; } |