Mercurial > hg > nginx

comparison src/core/ngx_file.c @ 1326:ccd8734e4a80 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1318, r1319, r1320, r1321 merge: fix various bugs found by Coverity's Scan
author Igor Sysoev <igor@sysoev.ru>
date Sun, 22 Jul 2007 08:40:39 +0000
parents 58f1641783ca
children d59617e7e6a1
comparison
equal deleted inserted replaced
1325:8b34fbcd9393 1326:ccd8734e4a80
454 if (ctx->init_handler(data, prev) == NGX_ABORT) { 454 if (ctx->init_handler(data, prev) == NGX_ABORT) {
455 goto failed; 455 goto failed;
456 } 456 }
457 457
458 ctx->data = data; 458 ctx->data = data;
459
460 } else {
461 data = NULL;
459 } 462 }
460 463
461 for ( ;; ) { 464 for ( ;; ) {
462 465
463 ngx_set_errno(0); 466 ngx_set_errno(0);
579 582
580 if (buf.len) { 583 if (buf.len) {
581 ngx_free(buf.data); 584 ngx_free(buf.data);
582 } 585 }
583 586
584 if (ctx->alloc) { 587 if (data) {
585 ngx_free(ctx->data); 588 ngx_free(data);
586 ctx->data = prev; 589 ctx->data = prev;
587 } 590 }
588 591
589 if (ngx_close_dir(&dir) == NGX_ERROR) { 592 if (ngx_close_dir(&dir) == NGX_ERROR) {
590 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno, 593 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,