Mercurial > hg > nginx
annotate contrib/geo2nginx.pl @ 9278:f53146df9a47
Fixed Valgrind complaints about uninitialized values.
In ngx_http_source_charset(), name->data was left uninitialized, and
only name->len was set. Since it is used in debug logging, this resulted
in the following complaints from Valgrind on systems with musl libc:
==42== Conditional jump or move depends on uninitialised value(s)
==42== at 0x12BC66: memcpy (string.h:51)
==42== by 0x12BC66: ngx_sprintf_str (ngx_string.c:586)
==42== by 0x12C03C: ngx_vslprintf (ngx_string.c:255)
==42== by 0x127694: ngx_log_error_core (ngx_log.c:135)
==42== by 0x1B8795: ngx_http_charset_header_filter (ngx_http_charset_filter_module.c:252)
Similarly, ngx_http_split_args() returned uninitialized arg->data, which
was then copied to r->args, and also used in debug logging:
==42== Conditional jump or move depends on uninitialised value(s)
==42== at 0x12BC10: memcpy (string.h:50)
==42== by 0x12BC10: ngx_sprintf_str (ngx_string.c:586)
==42== by 0x12C03C: ngx_vslprintf (ngx_string.c:255)
==42== by 0x127694: ngx_log_error_core (ngx_log.c:135)
==42== by 0x184EFB: ngx_http_internal_redirect (ngx_http_core_module.c:2526)
==42== by 0x1D8CCC: ngx_http_try_files_handler (ngx_http_try_files_module.c:209)
Fix is to initialize data to NULL. Note that, while memcpy(p, NULL, 0)
is also formally undefined now, it is used in multiple places in the code,
and expected to be allowed in C2y (see WG14 proposals N3177, N3261,
"Allow zero length operations on null pointers").
Prodded by Valgrind.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 31 May 2024 04:38:09 +0300 |
parents | c9ad0d9c7d59 |
children |
rev | line source |
---|---|
537 | 1 #!/usr/bin/perl -w |
2 | |
3 # (c) Andrei Nigmatulin, 2005 | |
4 # | |
5 # this script provided "as is", without any warranties. use it at your own risk. | |
6 # | |
7 # special thanx to Andrew Sitnikov for perl port | |
8 # | |
9 # this script converts CSV geoip database (free download at http://www.maxmind.com/app/geoip_country) | |
10 # to format, suitable for use with nginx_http_geo module (http://sysoev.ru/nginx) | |
11 # | |
12 # for example, line with ip range | |
13 # | |
14 # "62.16.68.0","62.16.127.255","1041253376","1041268735","RU","Russian Federation" | |
15 # | |
16 # will be converted to four subnetworks: | |
17 # | |
18 # 62.16.68.0/22 RU; | |
19 # 62.16.72.0/21 RU; | |
20 # 62.16.80.0/20 RU; | |
21 # 62.16.96.0/19 RU; | |
22 | |
23 | |
24 use warnings; | |
25 use strict; | |
26 | |
27 while( <STDIN> ){ | |
28 if (/"[^"]+","[^"]+","([^"]+)","([^"]+)","([^"]+)"/){ | |
29 print_subnets($1, $2, $3); | |
30 } | |
31 } | |
32 | |
33 sub print_subnets { | |
34 my ($a1, $a2, $c) = @_; | |
35 my $l; | |
36 while ($a1 <= $a2) { | |
37 for ($l = 0; ($a1 & (1 << $l)) == 0 && ($a1 + ((1 << ($l + 1)) - 1)) <= $a2; $l++){}; | |
38 print long2ip($a1) . "/" . (32 - $l) . " " . $c . ";\n"; | |
39 $a1 += (1 << $l); | |
40 } | |
41 } | |
42 | |
43 sub long2ip { | |
44 my $ip = shift; | |
45 | |
46 my $str = 0; | |
47 | |
48 $str = ($ip & 255); | |
49 | |
50 $ip >>= 8; | |
51 $str = ($ip & 255).".$str"; | |
52 | |
53 $ip >>= 8; | |
54 $str = ($ip & 255).".$str"; | |
55 | |
56 $ip >>= 8; | |
57 $str = ($ip & 255).".$str"; | |
58 } |