mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

2723. [bug] isc_base32_totext(), isc_base32hex_totext(), and

Browse Source 
isc_base64_totext(), didn't always mark regions of
			memory as fully consumed after conversion.  [RT #20445]
This commit is contained in:
Evan Hunt
2009-10-21 01:22:29 +00:00
parent b15df8f9bc
commit 8ec993c774
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
2723. [bug] isc_base32_totext(), isc_base32hex_totext(), and
isc_base64_totext(), didn't always mark regions of
memory as fully consumed after conversion. [RT #20445]
2722. [bug] Ensure that the memory associated with the name of 2722. [bug] Ensure that the memory associated with the name of
a node in a rbt tree is not altered during the life a node in a rbt tree is not altered during the life
of the node. [RT #20431] of the node. [RT #20431]

4
lib/isc/base32.c
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: base32.c,v 1.5 2009/01/18 23:48:14 tbox Exp $ */ /* $Id: base32.c,v 1.6 2009/10/21 01:22:29 each Exp $ */
/*! \file */ /*! \file */
@@ -112,6 +112,8 @@ base32_totext(isc_region_t *source, int wordlength, const char *wordbreak,
RETERR(str_totext(wordbreak, target)); RETERR(str_totext(wordbreak, target));
} }
} }
if (source->length > 0)
isc_region_consume(source, source->length);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }

4
lib/isc/base64.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: base64.c,v 1.32 2007/06/19 23:47:17 tbox Exp $ */ /* $Id: base64.c,v 1.33 2009/10/21 01:22:29 each Exp $ */
/*! \file */ /*! \file */
@@ -85,11 +85,13 @@ isc_base64_totext(isc_region_t *source, int wordlength,
buf[2] = base64[((source->base[1]<<2)&0x3c)]; buf[2] = base64[((source->base[1]<<2)&0x3c)];
buf[3] = '='; buf[3] = '=';
RETERR(str_totext(buf, target)); RETERR(str_totext(buf, target));
isc_region_consume(source, 2);
} else if (source->length == 1) { } else if (source->length == 1) {
buf[0] = base64[(source->base[0]>>2)&0x3f]; buf[0] = base64[(source->base[0]>>2)&0x3f];
buf[1] = base64[((source->base[0]<<4)&0x30)]; buf[1] = base64[((source->base[0]<<4)&0x30)];
buf[2] = buf[3] = '='; buf[2] = buf[3] = '=';
RETERR(str_totext(buf, target)); RETERR(str_totext(buf, target));
isc_region_consume(source, 1);
} }
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }