ITS#5580 fix length decoding, verified with PROTOS

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index a85f081aa49aba5627a2cf53452c911da6b48959..bceb742b4885f95d256eafceddeec7da0ad11abf 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -584,13 +584,11 @@ ber_get_next(
                                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;