Mercurial > hg > nginx-quic
annotate auto/cc/gcc @ 8460:3974f4e56a4e
Mail: fixed s->arg_start clearing on invalid IMAP commands.
Previously, s->arg_start was left intact after invalid IMAP commands,
and this might result in an argument incorrectly added to the following
command. Similarly, s->backslash was left intact as well, leading
to unneeded backslash removal.
For example (LFs from the client are explicitly shown as "<LF>"):
S: * OK IMAP4 ready
C: a01 login "\<LF>
S: a01 BAD invalid command
C: a0000000000\2 authenticate <LF>
S: a00000000002 aBAD invalid command
The backslash followed by LF generates invalid command with s->arg_start
and s->backslash set, the following command incorrectly treats anything
from the old s->arg_start to the space after the command as an argument,
and removes the backslash from the tag. If there is no space, s->arg_end
will be NULL.
Both things seem to be harmless though. In particular:
- This can be used to provide an incorrect argument to a command without
arguments. The only command which seems to look at the single argument
is AUTHENTICATE, and it checks the argument length before trying to
access it.
- Backslash removal uses the "end" pointer, and stops due to "src < end"
condition instead of scanning all the process memory if s->arg_end is
NULL (and arg[0].len is huge).
- There should be no backslashes in unquoted strings.
An obvious fix is to clear s->arg_start and s->backslash on invalid commands,
similarly to how it is done in POP3 parsing (added in 810:e3aa8f305d21) and
SMTP parsing.
This, however, makes it clear that s->arg_start handling in the "done"
label is wrong: s->arg_start cannot be legitimately set there, as it
is expected to be cleared in all possible cases when the "done" label is
reached. The relevant code is dead and will be removed by the following
change.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 19 May 2021 03:13:20 +0300 |
parents | 9eefb38f0005 |
children |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
501 | 6 # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 |
497 | 7 # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 |
521 | 8 # 4.0.0, 4.0.1, 4.1.0 |
501 | 9 |
10 | |
11 NGX_GCC_VER=`$CC -v 2>&1 | grep 'gcc version' 2>&1 \ | |
12 | sed -e 's/^.* version \(.*\)/\1/'` | |
13 | |
14 echo " + gcc version: $NGX_GCC_VER" | |
455 | 15 |
557 | 16 have=NGX_COMPILER value="\"gcc $NGX_GCC_VER\"" . auto/define |
17 | |
455 | 18 |
19 # Solaris 7's /usr/ccs/bin/as does not support "-pipe" | |
20 | |
21 CC_TEST_FLAGS="-pipe" | |
22 | |
577 | 23 ngx_feature="gcc -pipe switch" |
455 | 24 ngx_feature_name= |
25 ngx_feature_run=no | |
26 ngx_feature_incs= | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
743
diff
changeset
|
27 ngx_feature_path= |
455 | 28 ngx_feature_libs= |
29 ngx_feature_test= | |
30 . auto/feature | |
31 | |
32 CC_TEST_FLAGS= | |
33 | |
34 if [ $ngx_found = yes ]; then | |
35 PIPE="-pipe" | |
36 fi | |
37 | |
561 | 38 |
581 | 39 case "$NGX_MACHINE" in |
561 | 40 |
743 | 41 sun4u | sun4v | sparc | sparc64 ) |
563 | 42 # "-mcpu=v9" enables the "casa" assembler instruction |
561 | 43 CFLAGS="$CFLAGS -mcpu=v9" |
44 ;; | |
45 | |
46 esac | |
47 | |
48 | |
455 | 49 # optimizations |
50 | |
487 | 51 #NGX_GCC_OPT="-O2" |
52 #NGX_GCC_OPT="-Os" | |
53 NGX_GCC_OPT="-O" | |
54 | |
55 #CFLAGS="$CFLAGS -fomit-frame-pointer" | |
455 | 56 |
57 case $CPU in | |
58 pentium) | |
59 # optimize for Pentium and Athlon | |
60 CPU_OPT="-march=pentium" | |
589 | 61 NGX_CPU_CACHE_LINE=32 |
455 | 62 ;; |
63 | |
561 | 64 pentiumpro | pentium3) |
455 | 65 # optimize for Pentium Pro, Pentium II and Pentium III |
66 CPU_OPT="-march=pentiumpro" | |
589 | 67 NGX_CPU_CACHE_LINE=32 |
455 | 68 ;; |
69 | |
70 pentium4) | |
71 # optimize for Pentium 4, gcc 3.x | |
72 CPU_OPT="-march=pentium4" | |
589 | 73 NGX_CPU_CACHE_LINE=128 |
455 | 74 ;; |
75 | |
521 | 76 athlon) |
77 # optimize for Athlon, gcc 3.x | |
78 CPU_OPT="-march=athlon" | |
589 | 79 NGX_CPU_CACHE_LINE=64 |
521 | 80 ;; |
81 | |
509 | 82 opteron) |
83 # optimize for Opteron, gcc 3.x | |
84 CPU_OPT="-march=opteron" | |
589 | 85 NGX_CPU_CACHE_LINE=64 |
509 | 86 ;; |
87 | |
581 | 88 sparc32) |
89 # build 32-bit UltraSparc binary | |
90 CPU_OPT="-m32" | |
91 CORE_LINK="$CORE_LINK -m32" | |
589 | 92 NGX_CPU_CACHE_LINE=64 |
581 | 93 ;; |
94 | |
455 | 95 sparc64) |
96 # build 64-bit UltraSparc binary | |
97 CPU_OPT="-m64" | |
98 CORE_LINK="$CORE_LINK -m64" | |
589 | 99 NGX_CPU_CACHE_LINE=64 |
455 | 100 ;; |
101 | |
613 | 102 ppc64) |
103 # build 64-bit PowerPC binary | |
104 CPU_OPT="-m64" | |
105 CPU_OPT="$CPU_OPT -falign-functions=32 -falign-labels=32" | |
106 CPU_OPT="$CPU_OPT -falign-loops=32 -falign-jumps=32" | |
107 CORE_LINK="$CORE_LINK -m64" | |
108 NGX_CPU_CACHE_LINE=128 | |
109 ;; | |
110 | |
455 | 111 esac |
112 | |
3362
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
2751
diff
changeset
|
113 CC_AUX_FLAGS="$CC_AUX_FLAGS $CPU_OPT" |
455 | 114 |
501 | 115 case "$NGX_GCC_VER" in |
116 2.7*) | |
117 # batch build | |
118 CPU_OPT= | |
119 ;; | |
120 esac | |
455 | 121 |
122 | |
123 CFLAGS="$CFLAGS $PIPE $CPU_OPT" | |
124 | |
125 if [ ".$PCRE_OPT" = "." ]; then | |
126 PCRE_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" | |
127 else | |
128 PCRE_OPT="$PCRE_OPT $PIPE" | |
129 fi | |
130 | |
131 if [ ".$ZLIB_OPT" = "." ]; then | |
132 ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" | |
133 else | |
134 ZLIB_OPT="$ZLIB_OPT $PIPE" | |
135 fi | |
136 | |
137 | |
138 # warnings | |
139 | |
487 | 140 # -W requires at least -O |
1010 | 141 CFLAGS="$CFLAGS ${NGX_GCC_OPT:--O} -W" |
487 | 142 |
455 | 143 CFLAGS="$CFLAGS -Wall -Wpointer-arith" |
577 | 144 #CFLAGS="$CFLAGS -Wconversion" |
455 | 145 #CFLAGS="$CFLAGS -Winline" |
4760
d87b45d4a8a0
Added a commented out -Wmissing-prototypes to CFLAGS.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
146 #CFLAGS="$CFLAGS -Wmissing-prototypes" |
455 | 147 |
6583
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
148 case "$NGX_GCC_VER" in |
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
149 2.*) |
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
150 # we have a lot of the unused function arguments |
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
151 CFLAGS="$CFLAGS -Wno-unused" |
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
152 ;; |
501 | 153 |
6583
ade7d0335d77
Configure: revised GCC version processing.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6178
diff
changeset
|
154 *) |
501 | 155 # we have a lot of the unused function arguments |
156 CFLAGS="$CFLAGS -Wno-unused-parameter" | |
2751 | 157 # 4.2.1 shows the warning in wrong places |
501 | 158 #CFLAGS="$CFLAGS -Wunreachable-code" |
5714
80bd391c90d1
Configure: added -Wno-deprecated-declarations on OS X.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4767
diff
changeset
|
159 |
80bd391c90d1
Configure: added -Wno-deprecated-declarations on OS X.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4767
diff
changeset
|
160 # deprecated system OpenSSL library on OS X |
80bd391c90d1
Configure: added -Wno-deprecated-declarations on OS X.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4767
diff
changeset
|
161 if [ "$NGX_SYSTEM" = "Darwin" ]; then |
80bd391c90d1
Configure: added -Wno-deprecated-declarations on OS X.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4767
diff
changeset
|
162 CFLAGS="$CFLAGS -Wno-deprecated-declarations" |
80bd391c90d1
Configure: added -Wno-deprecated-declarations on OS X.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4767
diff
changeset
|
163 fi |
501 | 164 ;; |
165 esac | |
166 | |
455 | 167 |
168 # stop on warning | |
169 CFLAGS="$CFLAGS -Werror" | |
170 | |
171 # debug | |
172 CFLAGS="$CFLAGS -g" | |
173 | |
174 # DragonFly's gcc3 generates DWARF | |
175 #CFLAGS="$CFLAGS -g -gstabs" | |
176 | |
177 if [ ".$CPP" = "." ]; then | |
178 CPP="$CC -E" | |
179 fi |