upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 17:49:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch: ucdata 2.4 bugs (ITS#1751)

Browse source 
================
Written by Hallvard B. Furuseth and placed into the public domain.
This software is not subject to any license of the University of Oslo.
			================

ucgendat.c accessed unallocated memory when i == ncodes_size.

The changes others are trivial, I just include them since I'm patching
ucdata anyway:

ucdata.c   had some pointless '0 <= unsigned' comparisons.

ucstr.c    assigned a long* to an unsigned long*.  Since malloc()
           returns void*, the result need not be cast at all.

I'll send the ucgendat.c and ucdata.c patches to Mark Leisher
<mleisher@crl.nmsu.edu>.

Hallvard B. Furuseth <h.b.furuseth@usit.uio.no>, April 2002.
This commit is contained in:
Kurt Zeilenga 2002-04-15 20:39:22 +00:00
parent a1b4f71443
commit 319440033f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/liblunicode/ucdata/ucdata.c
View file

@ -603,9 +603,9 @@ uccomp_hangul(unsigned long *str, int len)
/* check if two current characters are L and V */
lindex = last - LBase;
if (0 <= lindex && lindex < (unsigned long) LCount) {
if (lindex < (unsigned long) LCount) {
unsigned long vindex = ch - VBase;
if (0 <= vindex && vindex < (unsigned long) VCount) {
if (vindex < (unsigned long) VCount) {
/* make syllable of form LV */
last = SBase + (lindex * VCount + vindex) * TCount;
str[rlen-1] = last; /* reset last */
@ -615,11 +615,11 @@ uccomp_hangul(unsigned long *str, int len)
/* check if two current characters are LV and T */
sindex = last - SBase;
if (0 <= sindex && sindex < (unsigned long) SCount
if (sindex < (unsigned long) SCount
&& (sindex % TCount) == 0)
{
unsigned long tindex = ch - TBase;
if (0 <= tindex && tindex <= (unsigned long) TCount) {
if (tindex <= (unsigned long) TCount) {
/* make syllable of form LVT */
last += tindex;
str[rlen-1] = last; /* reset last */

2
libraries/liblunicode/ucdata/ucgendat.c
View file

@ -739,7 +739,7 @@ add_number(unsigned long code, short num, short denom)
* Handle the case of the codes matching and simply replace the number
* that was there before.
*/
if (ncodes_used > 0 && code == ncodes[i].code) {
if (i < ncodes_used && code == ncodes[i].code) {
ncodes[i].idx = make_number(num, denom);
return;
}

6
libraries/liblunicode/ucstr.c
View file

@ -167,7 +167,7 @@ struct berval * UTF8bvnormalize(
i = 0;
}
p = ucs = (long *) malloc( len * sizeof(*ucs) );
p = ucs = malloc( len * sizeof(*ucs) );
if ( ucs == NULL ) {
free(out);
return NULL;
@ -342,7 +342,7 @@ int UTF8bvnormcmp(
* proper normalized form.
*/
ucs = (long *) malloc( ( ( norm1 || l1 > l2 ) ? l1 : l2 ) * sizeof(*ucs) );
ucs = malloc( ( ( norm1 || l1 > l2 ) ? l1 : l2 ) * sizeof(*ucs) );
if ( ucs == NULL ) {
return l1 > l2 ? 1 : -1; /* what to do??? */
}
@ -365,7 +365,7 @@ int UTF8bvnormcmp(
if ( norm1 ) {
ucsout1 = ucs;
l1 = ulen;
ucs = (long *) malloc( l2 * sizeof(*ucs) );
ucs = malloc( l2 * sizeof(*ucs) );
if ( ucs == NULL ) {
return l1 > l2 ? 1 : -1; /* what to do??? */
}