[Pkg-privacy-commits] [libotr] 95/225: Don't call memchr(foo, '\0', -1) even if it has no ill effects.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit b46d126db43e5175f7e43015c2bcdf092417f29a
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Sat Aug 18 16:40:31 2012 -0400

    Don't call memchr(foo,'\0',-1) even if it has no ill effects.
    
    Thanks to George Kadianakis <desnacked at riseup.net> for the report.
---
 ChangeLog     | 6 ++++++
 src/message.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2d609e9..e63ec33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-17
+
+	* src/message.c: Don't call memchr(foo,'\0',-1) even if it has
+	no ill effects.  Thanks to George Kadianakis
+	<desnacked at riseup.net> for the report.
+
 2012-07-20
 
 	* src/message.c, src/instag.c, toolkit/parse.c, src/sm.c,
diff --git a/src/message.c b/src/message.c
index 0b0b980..a6c167d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1350,7 +1350,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops,
 
 		    tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP1Q);
 		    if (tlv) {
-			if (nextMsg == OTRL_SMP_EXPECT1) {
+			if (nextMsg == OTRL_SMP_EXPECT1 && tlv->len > 0) {
 			    /* We can only do the verification half now.
 			     * We must wait for the secret to be entered
 			     * to continue. */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git