@@ -327,7 +327,7 @@ static PyObject* GetDataString(Cursor* cur, Py_ssize_t iCol)
     char tempBuffer[1026]; // Pad with 2 bytes for driver bugs
     DataBuffer buffer(nTargetType, tempBuffer, sizeof(tempBuffer)-2);
 
-    for (int iDbg = 0; iDbg < 10; iDbg++) // failsafe
+    for(;;)
     {
         SQLRETURN ret;
         SQLLEN cbData = 0;
@@ -396,14 +396,15 @@ static PyObject* GetDataString(Cursor* cur, Py_ssize_t iCol)
         {
             // For some reason, the NULL terminator is used in intermediate buffers but not in this final one.
             buffer.AddUsed(cbData);
+            return buffer.DetachValue();
         }
-
-        if (ret == SQL_SUCCESS || ret == SQL_NO_DATA)
+        else if (ret == SQL_NO_DATA) {
             return buffer.DetachValue();
+        }
+        else {
+            return RaiseErrorFromHandle("SQLGetData", cur->cnxn->hdbc, cur->hstmt);
+        }
     }
-
-    // REVIEW: Add an error message.
-    return 0;
 }
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ static PyObject* GetDataString(Cursor* cur, Py_ssize_t iCol)`
`327`	`327`	`char tempBuffer[1026]; // Pad with 2 bytes for driver bugs`
`328`	`328`	`DataBuffer buffer(nTargetType, tempBuffer, sizeof(tempBuffer)-2);`
`329`	`329`
`330`		`- for (int iDbg = 0; iDbg < 10; iDbg++) // failsafe`
	`330`	`+ for(;;)`
`331`	`331`	`{`
`332`	`332`	`SQLRETURN ret;`
`333`	`333`	`SQLLEN cbData = 0;`
`@@ -396,14 +396,15 @@ static PyObject* GetDataString(Cursor* cur, Py_ssize_t iCol)`
`396`	`396`	`{`
`397`	`397`	`// For some reason, the NULL terminator is used in intermediate buffers but not in this final one.`
`398`	`398`	`buffer.AddUsed(cbData);`
	`399`	`+ return buffer.DetachValue();`
`399`	`400`	`}`
`400`		`-`
`401`		`- if (ret == SQL_SUCCESS \|\| ret == SQL_NO_DATA)`
	`401`	`+ else if (ret == SQL_NO_DATA) {`
`402`	`402`	`return buffer.DetachValue();`
	`403`	`+ }`
	`404`	`+ else {`
	`405`	`+ return RaiseErrorFromHandle("SQLGetData", cur->cnxn->hdbc, cur->hstmt);`
	`406`	`+ }`
`403`	`407`	`}`
`404`		`-`
`405`		`- // REVIEW: Add an error message.`
`406`		`- return 0;`
`407`	`408`	`}`
`408`	`409`
`409`	`410`