Mercurial > hg > nginx-quic
annotate auto/cc/owc @ 4617:972642646f06
Rewrite: fixed escaping and possible segfault (ticket #162).
The following code resulted in incorrect escaping of uri and possible
segfault:
location / {
rewrite ^(.*) $1?c=$1;
return 200 "$uri";
}
If there were arguments in a rewrite's replacement string, and length was
actually calculated (due to duplicate captures as in the example above,
or variables present), the is_args flag was set and incorrectly copied
after length calculation. This resulted in escaping applied to the uri part
of the replacement, resulting in incorrect escaping. Additionally, buffer
was allocated without escaping expected, thus this also resulted in buffer
overrun and possible segfault.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 11 May 2012 13:19:22 +0000 |
parents | d620f497c50f |
children | 670ceaba03d8 |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
583 | 6 # Open Watcom C 1.0, 1.2, 1.3 |
455 | 7 |
8 # optimizations | |
9 | |
10 # maximize speed | |
11 CFLAGS="$CFLAGS -ot" | |
577 | 12 # reorder instructions for best pipeline usage |
455 | 13 CFLAGS="$CFLAGS -op" |
14 # inline intrinsic functions | |
15 CFLAGS="$CFLAGS -oi" | |
16 # inline expansion | |
17 CFLAGS="$CFLAGS -oe" | |
18 # disable stack checking calls | |
19 CFLAGS="$CFLAGS -s" | |
20 | |
21 case $CPU in | |
22 pentium) | |
23 # optimize for Pentium and Athlon | |
24 # register-based arguments passing conventions | |
25 CPU_OPT="-5r" | |
26 # stack-based arguments passing conventions | |
27 #CPU_OPT="-5s" | |
577 | 28 ;; |
455 | 29 |
30 pentiumpro) | |
31 # optimize for Pentium Pro, Pentium II and Pentium III | |
32 # register-based arguments passing conventions | |
33 CPU_OPT="-6r" | |
34 # stack-based arguments passing conventions | |
35 #CPU_OPT="-6s" | |
36 ;; | |
37 esac | |
38 | |
39 CFLAGS="$CFLAGS $CPU_OPT" | |
40 | |
41 | |
42 # warnings | |
43 | |
499 | 44 # maximum level |
45 CFLAGS="$CFLAGS -wx" | |
455 | 46 #CFLAGS="$CFLAGS -w3" |
47 | |
48 # stop on warning | |
49 CFLAGS="$CFLAGS -we" | |
50 | |
51 # built target is NT | |
52 CFLAGS="$CFLAGS -bt=nt" | |
53 | |
54 # multithreaded | |
55 CFLAGS="$CFLAGS -bm" | |
56 | |
57 # debug | |
58 CFLAGS="$CFLAGS -d2" | |
59 | |
60 # quiet | |
61 CFLAGS="$CFLAGS -zq" | |
62 | |
63 # Open Watcom C 1.2 | |
583 | 64 have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have |
455 | 65 |
461 | 66 |
577 | 67 # the precompiled headers |
469 | 68 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" |
69 NGX_PCH="$NGX_OBJS/ngx_config.pch" | |
70 NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" | |
71 NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" | |
455 | 72 |
461 | 73 |
74 # the link flags, built target is NT GUI mode application | |
2725 | 75 #CORE_LINK="$CORE_LINK -l=nt_win" |
461 | 76 |
77 | |
78 # the resource file | |
469 | 79 NGX_RCC="wrc \$(CORE_INCS) -fo=$NGX_OBJS/nginx.res " |
80 NGX_RCC="$NGX_RCC $NGX_WIN32_RC $NGX_OBJS/nginx.exe" | |
461 | 81 |
455 | 82 |
83 ngx_include_opt="-i=" | |
84 ngx_objout="-fo" | |
85 ngx_binout="-fe=" | |
86 ngx_objext="obj" | |
87 ngx_binext=".exe" | |
88 | |
89 ngx_regex_dirsep='\\' | |
90 ngx_dirsep="\\" | |
2825
bb05c0834c8c
remove BMAKE (build make): a cc compiler should use own make
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
91 |
2839
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
92 ngx_long_start=' ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
93 ngx_long_end=' ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
94 ngx_long_regex_cont=' \&\ |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
95 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
96 ngx_long_cont=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
97 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
98 |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
99 ngx_regex_cont=' \&\ |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
100 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
101 ngx_cont=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
102 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
103 ngx_tab=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
104 ' |