[PHP-CVS] cvs: php-src /ext/pdo_dblib dblib_stmt.c

[Wez Furlong]

wez             Fri Jun 10 02:32:36 2005 EDT

  Modified files:              
    /php-src/ext/pdo_dblib      dblib_stmt.c 
  Log:
  Patch from zhao ming sen.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_stmt.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo_dblib/dblib_stmt.c
diff -u php-src/ext/pdo_dblib/dblib_stmt.c:1.4 
php-src/ext/pdo_dblib/dblib_stmt.c:1.5
--- php-src/ext/pdo_dblib/dblib_stmt.c:1.4      Sun Feb  6 17:28:50 2005
+++ php-src/ext/pdo_dblib/dblib_stmt.c  Fri Jun 10 02:32:36 2005
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: dblib_stmt.c,v 1.4 2005/02/06 22:28:50 wez Exp $ */
+/* $Id: dblib_stmt.c,v 1.5 2005/06/10 06:32:36 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -95,6 +95,10 @@
 
        ret = dbnextrow(H->link);
 
+    if (ret == NO_MORE_ROWS) {
+       return 0;
+    }
+    
        if (!S->cols) {
                S->ncols = dbnumcols(H->link);
 
@@ -133,7 +137,7 @@
                        S->rows = erealloc(S->rows, arows * size);
                }
                for (i = 0; i < S->ncols; i++) {
-                       pdo_dblib_colval *val = &S->rows[S->nrows] + i;
+                       pdo_dblib_colval *val = &S->rows[S->nrows * S->ncols + 
i];
 
                        switch (S->cols[i].coltype) {
                                case SQLCHAR:
@@ -226,7 +230,7 @@
         unsigned long *len, int *caller_frees TSRMLS_DC)
 {
        pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
-       pdo_dblib_colval *val = &S->rows[S->current] + colno;
+       pdo_dblib_colval *val = &S->rows[S->current * S->ncols + colno];
 
        *ptr = val->data;
        *len = val->len;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php