projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb8cc0b
)
multi: fix SEGV for scan
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 30 Aug 2012 10:54:45 +0000
(12:54 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 30 Aug 2012 10:54:45 +0000
(12:54 +0200)
src/filter_multi.cpp
patch
|
blob
|
history
diff --git
a/src/filter_multi.cpp
b/src/filter_multi.cpp
index
ccdcc4a
..
b32c115
100644
(file)
--- a/
src/filter_multi.cpp
+++ b/
src/filter_multi.cpp
@@
-1112,7
+1112,7
@@
void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req)
entries_before.begin();
while (it != entries_before.end() && my <*it)
it++;
- if (my == *it)
+ if (it != entries_before.end() && my == *it)
{
it->m_count += my.m_count;
}
@@
-1153,7
+1153,7
@@
void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req)
entries_after.begin();
while (it != entries_after.end() && *it < my)
it++;
- if (my == *it)
+ if (it != entries_after.end() && my == *it)
{
it->m_count += my.m_count;
}