Diff for /libraries/liblber/decode.c between versions 1.111 and 1.117

version 1.111, 2007/08/24 19:58:20 version 1.117, 2009/02/10 20:29:56
Line 1 Line 1
 /* decode.c - ber input decoding routines */  /* decode.c - ber input decoding routines */
 /* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.110 2007/07/23 10:57:23 hallvard Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.115 2009/01/21 23:40:19 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2007 The OpenLDAP Foundation.   * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 69  ber_decode_oid( BerValue *in, BerValue * Line 69  ber_decode_oid( BerValue *in, BerValue *
                 val |= der[i] & 0x7f;                  val |= der[i] & 0x7f;
                 if ( !( der[i] & 0x80 )) {                  if ( !( der[i] & 0x80 )) {
                         if ( ptr == NULL ) {                          if ( ptr == NULL ) {
                                 /* Initial "x.y": val=x*40+y, x<=2, y<40 if x=2 */                                  /* Initial "x.y": val=x*40+y, x<=2, y<40 if x<2 */
                                 ptr = out->bv_val;                                  ptr = out->bv_val;
                                 val1 = (val < 80 ? val/40 : 2);                                  val1 = (val < 80 ? val/40 : 2);
                                 val -= val1*40;                                  val -= val1*40;
Line 780  ber_scanf ( BerElement *ber, Line 780  ber_scanf ( BerElement *ber,
   
         fmt_reset = fmt;          fmt_reset = fmt;
   
         ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,          if ( ber->ber_debug & (LDAP_DEBUG_TRACE|LDAP_DEBUG_BER)) {
                 "ber_scanf fmt (%s) ber:\n", fmt );                  ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
         ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );                          "ber_scanf fmt (%s) ber:\n", fmt );
                   ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
           }
   
         for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {          for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
                 /* When this is modified, remember to update                  /* When this is modified, remember to update

Removed from v.1.111  
changed lines
  Added in v.1.117


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org