From c70bf3ea28cdf6bafd8571690d3e5c466a0658a2 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 20 Sep 2013 18:59:30 +0000 Subject: QPID-4984: WIP - Merge from trunk r.1525056 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1525101 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/extras/dispatch/src/iterator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/extras/dispatch/src/iterator.c') diff --git a/qpid/extras/dispatch/src/iterator.c b/qpid/extras/dispatch/src/iterator.c index eb302fe9ad..0239a083ca 100644 --- a/qpid/extras/dispatch/src/iterator.c +++ b/qpid/extras/dispatch/src/iterator.c @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -367,7 +367,7 @@ dx_field_iterator_t *dx_field_iterator_sub(dx_field_iterator_t *iter, uint32_t l void dx_field_iterator_advance(dx_field_iterator_t *iter, uint32_t length) { // TODO - Make this more efficient. - for (uint8_t idx = 0; idx < length; idx++) + for (uint8_t idx = 0; idx < length && !dx_field_iterator_end(iter); idx++) dx_field_iterator_octet(iter); } -- cgit v1.2.1