Merge branch 'mysql-5.5' into mysql-5.6

Robert Golebiowski · Robert Golebiowski · commit e40190b40a5c · 2015-07-08T13:54:43.000+02:00
diff --git a/extra/yassl/README b/extra/yassl/README
@@ -12,6 +12,11 @@ before calling SSL_new();
 
 *** end Note ***
 
+yaSSL Patch notes, version 2.3.7d (6/22/2015)
+    This release of yaSSL includes a fix for input_buffer set_current with
+    index 0.  SSL_peek() at front of waiting data could trigger.  Robert
+    Golebiowski of Oracle identified and suggested a fix, thanks!
+
 yaSSL Patch notes, version 2.3.7c (6/12/2015)
     This release of yaSSL does certificate DATE comparisons to the second
     instead of to the minute, helpful when using freshly generated certs.
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
@@ -34,7 +34,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.3.7c"
+#define YASSL_VERSION "2.3.7d"
 
 
 #if defined(__cplusplus)
diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp
@@ -164,7 +164,7 @@ void input_buffer::set_error()
 
 void input_buffer::set_current(uint i) 
 {
-    if (error_ == 0 && i && check(i - 1, size_) == 0)
+    if (error_ == 0 && check(i ? i - 1 : 0, size_) == 0)
         current_ = i;
     else
         error_ = -1;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ void input_buffer::set_error()`
`164`	`164`
`165`	`165`	`void input_buffer::set_current(uint i)`
`166`	`166`	`{`
`167`		`- if (error_ == 0 && i && check(i - 1, size_) == 0)`
	`167`	`+ if (error_ == 0 && check(i ? i - 1 : 0, size_) == 0)`
`168`	`168`	`current_ = i;`
`169`	`169`	`else`
`170`	`170`	`error_ = -1;`