Mercurial > hg > nginx
annotate src/core/ngx_hash.h @ 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 | f8f6b9fee66a |
rev | line source |
---|---|
507 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
507 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_HASH_H_INCLUDED_ | |
9 #define _NGX_HASH_H_INCLUDED_ | |
10 | |
11 | |
12 #include <ngx_config.h> | |
13 #include <ngx_core.h> | |
14 | |
15 | |
16 typedef struct { | |
589 | 17 void *value; |
3510
4c70bbdfd076
allow hash key values more than 255 bytes, it does not actually increase mean
Igor Sysoev <igor@sysoev.ru>
parents:
2136
diff
changeset
|
18 u_short len; |
589 | 19 u_char name[1]; |
20 } ngx_hash_elt_t; | |
507 | 21 |
589 | 22 |
23 typedef struct { | |
24 ngx_hash_elt_t **buckets; | |
25 ngx_uint_t size; | |
507 | 26 } ngx_hash_t; |
27 | |
28 | |
29 typedef struct { | |
589 | 30 ngx_hash_t hash; |
31 void *value; | |
32 } ngx_hash_wildcard_t; | |
33 | |
34 | |
35 typedef struct { | |
36 ngx_str_t key; | |
37 ngx_uint_t key_hash; | |
38 void *value; | |
39 } ngx_hash_key_t; | |
40 | |
41 | |
42 typedef ngx_uint_t (*ngx_hash_key_pt) (u_char *data, size_t len); | |
43 | |
44 | |
45 typedef struct { | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
46 ngx_hash_t hash; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
47 ngx_hash_wildcard_t *wc_head; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
48 ngx_hash_wildcard_t *wc_tail; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
49 } ngx_hash_combined_t; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
50 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
51 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
52 typedef struct { |
589 | 53 ngx_hash_t *hash; |
54 ngx_hash_key_pt key; | |
55 | |
56 ngx_uint_t max_size; | |
57 ngx_uint_t bucket_size; | |
58 | |
59 char *name; | |
60 ngx_pool_t *pool; | |
61 ngx_pool_t *temp_pool; | |
62 } ngx_hash_init_t; | |
63 | |
64 | |
593 | 65 #define NGX_HASH_SMALL 1 |
66 #define NGX_HASH_LARGE 2 | |
67 | |
68 #define NGX_HASH_LARGE_ASIZE 16384 | |
69 #define NGX_HASH_LARGE_HSIZE 10007 | |
70 | |
71 #define NGX_HASH_WILDCARD_KEY 1 | |
597 | 72 #define NGX_HASH_READONLY_KEY 2 |
593 | 73 |
74 | |
75 typedef struct { | |
76 ngx_uint_t hsize; | |
77 | |
78 ngx_pool_t *pool; | |
79 ngx_pool_t *temp_pool; | |
80 | |
81 ngx_array_t keys; | |
82 ngx_array_t *keys_hash; | |
83 | |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
84 ngx_array_t dns_wc_head; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
85 ngx_array_t *dns_wc_head_hash; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
86 |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
87 ngx_array_t dns_wc_tail; |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
88 ngx_array_t *dns_wc_tail_hash; |
593 | 89 } ngx_hash_keys_arrays_t; |
90 | |
91 | |
589 | 92 typedef struct { |
93 ngx_uint_t hash; | |
94 ngx_str_t key; | |
95 ngx_str_t value; | |
649 | 96 u_char *lowcase_key; |
507 | 97 } ngx_table_elt_t; |
98 | |
99 | |
589 | 100 void *ngx_hash_find(ngx_hash_t *hash, ngx_uint_t key, u_char *name, size_t len); |
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
101 void *ngx_hash_find_wc_head(ngx_hash_wildcard_t *hwc, u_char *name, size_t len); |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
102 void *ngx_hash_find_wc_tail(ngx_hash_wildcard_t *hwc, u_char *name, size_t len); |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
103 void *ngx_hash_find_combined(ngx_hash_combined_t *hash, ngx_uint_t key, |
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
1241
diff
changeset
|
104 u_char *name, size_t len); |
589 | 105 |
106 ngx_int_t ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, | |
107 ngx_uint_t nelts); | |
108 ngx_int_t ngx_hash_wildcard_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, | |
109 ngx_uint_t nelts); | |
110 | |
649 | 111 #define ngx_hash(key, c) ((ngx_uint_t) key * 31 + c) |
589 | 112 ngx_uint_t ngx_hash_key(u_char *data, size_t len); |
113 ngx_uint_t ngx_hash_key_lc(u_char *data, size_t len); | |
2136 | 114 ngx_uint_t ngx_hash_strlow(u_char *dst, u_char *src, size_t n); |
115 | |
589 | 116 |
593 | 117 ngx_int_t ngx_hash_keys_array_init(ngx_hash_keys_arrays_t *ha, ngx_uint_t type); |
118 ngx_int_t ngx_hash_add_key(ngx_hash_keys_arrays_t *ha, ngx_str_t *key, | |
119 void *value, ngx_uint_t flags); | |
120 | |
589 | 121 |
507 | 122 #endif /* _NGX_HASH_H_INCLUDED_ */ |