← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to ext/mysqlnd/mysqlnd_loaddata.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/mysqlnd/mysqlnd_loaddata.c
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
}