Bub#21067193 Correct absolute() when invalid position value is passed.

silvakid · silvakid · commit 87308c57b8cd · 2015-05-13T17:42:41.000+01:00
Add unit test.
diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string.h>
 #include <stdlib.h>
 #include <sstream>
+#include <limits>
 #include <boost/scoped_array.hpp>
 
 
@@ -134,7 +135,7 @@ MySQL_Prepared_ResultSet::absolute(const int new_pos)
 			return true;
 		}
 	} else if (new_pos < 0) {
-		if ((-new_pos) > (int) num_rows) {
+        if ((-new_pos) > (int) num_rows || (new_pos == std::numeric_limits<int>::min())) {
 			row_position = 0; /* before first new_pos */
 		} else {
 			row_position = num_rows - (-new_pos) + 1;
diff --git a/driver/mysql_resultset.cpp b/driver/mysql_resultset.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdlib.h>
 #include <stdio.h>
 #include <sstream>
+#include <limits>
 #include <boost/scoped_array.hpp>
 
 #include <cppconn/exception.h>
@@ -100,7 +101,7 @@ MySQL_ResultSet::absolute(const int new_pos)
 			return true;
 		}
 	} else if (new_pos < 0) {
-		if ((-new_pos) > (int) num_rows) {
+        if ((-new_pos) > (int) num_rows || (new_pos == std::numeric_limits<int>::min())) {
 			row_position = 0; /* before first new_pos */
 		} else {
 			row_position = num_rows - (-new_pos)  + 1;
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "bugs.h"
 #include <sstream>
+#include <limits>
 #include "driver/mysql_error.h"
 
 namespace testsuite
@@ -856,6 +857,39 @@ void bugs::bug17218692()
   }
 
 
+}
+
+void bugs::bug21067193()
+{
+  logMsg("bugs::bug21067193");
+  try
+  {
+    int x = std::numeric_limits<int>::max();
+    int y = std::numeric_limits<int>::min();
+
+
+    stmt->execute("DROP TABLE IF EXISTS bug21067193");
+    stmt->execute("create table bug21067193(id int)");
+    stmt->execute("insert into bug21067193 values(1),(2),(3)");
+
+    res.reset((stmt->setResultSetType(sql::ResultSet::TYPE_SCROLL_SENSITIVE)->executeQuery("select * from bug21067193")));
+
+    ASSERT_EQUALS(true, res->absolute(2));
+    ASSERT_EQUALS(2, res->getInt(1));
+
+    ASSERT_EQUALS(true, res->absolute(-1));
+    ASSERT_EQUALS(3, res->getInt(1));
+
+    ASSERT_EQUALS(false, res->absolute(std::numeric_limits<int>::min())); //Invalid position, Returns FALSE
+
+  }
+  catch (sql::SQLException & e)
+  {
+//	Error....
+      throw;
+  }
+
+
 }
 
 } /* namespace regression */
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -64,6 +64,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug14520822);
     TEST_CASE(bug17218692);
     TEST_CASE(bug21053335);
+    TEST_CASE(bug21067193);
   }
 
   /**
@@ -113,6 +114,8 @@ class bugs : public unit_fixture
 
   void bug21053335();
 
+  void bug21067193();
+
 };
 
 REGISTER_FIXTURE(bugs);
