From ec938a2fa1feb3422d2533cbb6f7b66423d5ae80 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 31 May 2006 15:32:43 +0000 Subject: [PATCH] Fixed bug #599: ODR error on incoming PDU. Error was in the ODR buffer handling for ZOOM packages (extended services). --- src/zoom-c.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/zoom-c.c b/src/zoom-c.c index c01ccb8..780bf10 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.72 2006-05-10 07:34:38 adam Exp $ + * $Id: zoom-c.c,v 1.73 2006-05-31 15:32:43 adam Exp $ */ /** * \file zoom-c.c @@ -1155,7 +1155,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c) ZOOM_options_get(c->options, "implementationName"), odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName)); - version = odr_strdup(c->odr_out, "$Revision: 1.72 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.73 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = odr_prepend(c->odr_out, @@ -2556,8 +2556,10 @@ static zoom_ret send_package (ZOOM_connection c) event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU); ZOOM_connection_put_event (c, event); - return do_write_ex (c, c->tasks->u.package->buf_out, - c->tasks->u.package->len_out); + c->buf_out = c->tasks->u.package->buf_out; + c->len_out = c->tasks->u.package->len_out; + + return do_write(c); } static zoom_ret send_scan (ZOOM_connection c) -- 1.7.10.4