Mercurial > hg > nginx
annotate src/core/ngx_queue.c @ 5418:6961d52ebc49 stable-1.4
Core: fix misallocation at ngx_crypt_apr1 (ticket #412).
Found by using auth_basic.t from mdounin nginx-tests under valgrind.
==10470== Invalid write of size 1
==10470== at 0x43603D: ngx_crypt_to64 (ngx_crypt.c:168)
==10470== by 0x43648E: ngx_crypt (ngx_crypt.c:153)
==10470== by 0x489D8B: ngx_http_auth_basic_crypt_handler (ngx_http_auth_basic_module.c:297)
==10470== by 0x48A24A: ngx_http_auth_basic_handler (ngx_http_auth_basic_module.c:240)
==10470== by 0x44EAB9: ngx_http_core_access_phase (ngx_http_core_module.c:1121)
==10470== by 0x44A822: ngx_http_core_run_phases (ngx_http_core_module.c:895)
==10470== by 0x44A932: ngx_http_handler (ngx_http_core_module.c:878)
==10470== by 0x455EEF: ngx_http_process_request (ngx_http_request.c:1852)
==10470== by 0x456527: ngx_http_process_request_headers (ngx_http_request.c:1283)
==10470== by 0x456A91: ngx_http_process_request_line (ngx_http_request.c:964)
==10470== by 0x457097: ngx_http_wait_request_handler (ngx_http_request.c:486)
==10470== by 0x4411EE: ngx_epoll_process_events (ngx_epoll_module.c:691)
==10470== Address 0x5866fab is 0 bytes after a block of size 27 alloc'd
==10470== at 0x4A074CD: malloc (vg_replace_malloc.c:236)
==10470== by 0x43B251: ngx_alloc (ngx_alloc.c:22)
==10470== by 0x421B0D: ngx_malloc (ngx_palloc.c:119)
==10470== by 0x421B65: ngx_pnalloc (ngx_palloc.c:147)
==10470== by 0x436368: ngx_crypt (ngx_crypt.c:140)
==10470== by 0x489D8B: ngx_http_auth_basic_crypt_handler (ngx_http_auth_basic_module.c:297)
==10470== by 0x48A24A: ngx_http_auth_basic_handler (ngx_http_auth_basic_module.c:240)
==10470== by 0x44EAB9: ngx_http_core_access_phase (ngx_http_core_module.c:1121)
==10470== by 0x44A822: ngx_http_core_run_phases (ngx_http_core_module.c:895)
==10470== by 0x44A932: ngx_http_handler (ngx_http_core_module.c:878)
==10470== by 0x455EEF: ngx_http_process_request (ngx_http_request.c:1852)
==10470== by 0x456527: ngx_http_process_request_headers (ngx_http_request.c:1283)
==10470==
| author | Markus Linnala <Markus.Linnala@cybercom.com> |
|---|---|
| date | Fri, 20 Sep 2013 17:57:21 +0300 |
| parents | d620f497c50f |
| children | 3038bd4d7816 |
| rev | line source |
|---|---|
| 2026 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 2026 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 | |
| 11 | |
| 12 /* | |
| 13 * find the middle queue element if the queue has odd number of elements | |
| 14 * or the first element of the queue's second part otherwise | |
| 15 */ | |
| 16 | |
| 17 ngx_queue_t * | |
| 18 ngx_queue_middle(ngx_queue_t *queue) | |
| 19 { | |
| 20 ngx_queue_t *middle, *next; | |
| 21 | |
| 22 middle = ngx_queue_head(queue); | |
| 23 | |
| 24 if (middle == ngx_queue_last(queue)) { | |
| 25 return middle; | |
| 26 } | |
| 27 | |
| 28 next = ngx_queue_head(queue); | |
| 29 | |
| 30 for ( ;; ) { | |
| 31 middle = ngx_queue_next(middle); | |
| 32 | |
| 33 next = ngx_queue_next(next); | |
| 34 | |
| 35 if (next == ngx_queue_last(queue)) { | |
| 36 return middle; | |
| 37 } | |
| 38 | |
| 39 next = ngx_queue_next(next); | |
| 40 | |
| 41 if (next == ngx_queue_last(queue)) { | |
| 42 return middle; | |
| 43 } | |
| 44 } | |
| 45 } | |
| 46 | |
| 47 | |
| 48 /* the stable insertion sort */ | |
| 49 | |
| 50 void | |
| 51 ngx_queue_sort(ngx_queue_t *queue, | |
| 52 ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *)) | |
| 53 { | |
| 54 ngx_queue_t *q, *prev, *next; | |
| 55 | |
| 56 q = ngx_queue_head(queue); | |
| 57 | |
| 58 if (q == ngx_queue_last(queue)) { | |
| 59 return; | |
| 60 } | |
| 61 | |
| 62 for (q = ngx_queue_next(q); q != ngx_queue_sentinel(queue); q = next) { | |
| 63 | |
| 64 prev = ngx_queue_prev(q); | |
| 65 next = ngx_queue_next(q); | |
| 66 | |
| 67 ngx_queue_remove(q); | |
| 68 | |
| 69 do { | |
| 70 if (cmp(prev, q) <= 0) { | |
| 71 break; | |
| 72 } | |
| 73 | |
| 74 prev = ngx_queue_prev(prev); | |
| 75 | |
| 76 } while (prev != ngx_queue_sentinel(queue)); | |
| 77 | |
| 78 ngx_queue_insert_after(prev, q); | |
| 79 } | |
| 80 } |