~legolas/ubuntu/natty/php5/5.3.5

« back to all changes in this revision

Viewing changes to ext/mysqlnd/mysqlnd_loaddata.c

  • Committer: Stas Verberkt
  • Date: 2011-02-01 09:27:15 UTC
  • Revision ID: legolas@legolasweb.nl-20110201092715-yq052iu2yl4i2eyg
Inserted PHP 5.3.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
        if (!info) {
58
58
                DBG_RETURN(1);
59
59
        }
60
 
        
 
60
 
61
61
        *ptr = info;
62
62
 
63
63
        /* check open_basedir */
173
173
enum_func_status
174
174
mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC)
175
175
{
176
 
        char                            *buf;
 
176
        char                            *buf = NULL;
177
177
        char                            empty_packet[MYSQLND_HEADER_SIZE];
178
178
        enum_func_status        result = FAIL;
179
179
        unsigned int            buflen = 4096;
244
244
        }
245
245
 
246
246
        (*conn->infile.local_infile_end)(info TSRMLS_CC);
247
 
        mnd_efree(buf);
 
247
        if (buf) {
 
248
                mnd_efree(buf);
 
249
        }
248
250
        DBG_INF_FMT("%s", result == PASS? "PASS":"FAIL");
249
251
        DBG_RETURN(result);
250
252
}