Attachment 310609 Details for Bug 453444 – Patch from upstream CVE

[patch] Patch from upstream CVE

io.c.diff (text/plain), 1.12 KB, created by Josh Bressers on 2008-06-30 17:53:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-06-30 17:53:21 UTC

Size: 1.12 KB

patch

obsolete

>===================================================================
>RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/io.c,v
>retrieving revision 1.120
>retrieving revision 1.121
>diff -u -r1.120 -r1.121
>--- libraries/liblber/io.c	2008/01/07 23:20:03	1.120
>+++ libraries/liblber/io.c	2008/06/27 00:36:41	1.121
>@@ -1,5 +1,5 @@
> /* io.c - ber general i/o routines */
>-/* $OpenLDAP: libraries/liblber/io.c,v 1.120 2008/01/07 23:20:03 kurt Exp $ */
>+/* $OpenLDAP: libraries/liblber/io.c,v 1.121 2008/06/27 00:36:41 hyc Exp $ */
> /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
>  *
>  * Copyright 1998-2008 The OpenLDAP Foundation.
>@@ -584,13 +584,11 @@
> 				return LBER_DEFAULT;
> 			}
> 			/* Not enough bytes? */
>-			if (ber->ber_rwptr - (char *)p < llen) {
>-#if defined( EWOULDBLOCK )
>-				sock_errset(EWOULDBLOCK);
>-#elif defined( EAGAIN )
>-				sock_errset(EAGAIN);
>-#endif			
>-				return LBER_DEFAULT;
>+			i = ber->ber_rwptr - (char *)p;
>+			if (i < llen) {
>+				sblen=ber_int_sb_read( sb, ber->ber_rwptr, i );
>+				if (sblen<i) return LBER_DEFAULT;
>+				ber->ber_rwptr += sblen;
> 			}
> 			for (i=0; i<llen; i++) {
> 				tlen <<=8;

Actions: View | Diff

Attachments on bug 453444: 310609