← Back to branch summary

~dedzone/drizzle/query-cache-hook

« back to all changes in this revision

Viewing changes to plugin/pbms/src/pbms.h

  • Committer: Djellel E. Difallah
  • Date: 2010-07-12 21:22:55 UTC
  • mfrom: (1644.2.16 build)
  • Revision ID: ded@ubuntu-20100712212255-w9fa5cyynd741zx0
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/pbms.h
152
152
        static bool couldBeURL(const char *blob_url, size_t size, MSBlobURLPtr blob)
153
153
        {
154
154
                if (blob_url && (size < PBMS_BLOB_URL_SIZE)) {
 
155
                        MSBlobURLRec ignored_blob;
155
156
                        char    buffer[PBMS_BLOB_URL_SIZE+1];
156
157
                        char    junk[5];
157
158
                        int             scanned;
158
 
 
 
159
                        
 
160
                        if (!blob)
 
161
                                blob = &ignored_blob;
 
162
                        
159
163
                        junk[0] = 0;
160
164
                        if (blob_url[size]) { // There is no guarantee that the URL will be null terminated.
161
165
                                memcpy(buffer, blob_url, size);
458
462
                if ((err = getSharedMemory(false, result)))
459
463
                        return err;
460
464
 
461
 
                if (!PBMSBlobURLTools::couldBeURL(blob_url, blob_size)) {
 
465
                if (!PBMSBlobURLTools::couldBeURL(blob_url, blob_size, NULL)) {
462
466
                
463
467
                        if (!sharedMemory->sm_callbacks)  {
464
468
                                ret_blob_url->bu_data[0] = 0;
500
504
                if (!sharedMemory->sm_callbacks)
501
505
                        return MS_OK;
502
506
 
503
 
                if (!PBMSBlobURLTools::couldBeURL(blob_url, blob_size))
 
507
                if (!PBMSBlobURLTools::couldBeURL(blob_url, blob_size, NULL))
504
508
                        return MS_OK;
505
509
 
506
510
                if (blob_url[blob_size]) {