You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/09/17 01:16:50 UTC
svn commit: r816005 - /httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
Author: wrowe
Date: Wed Sep 16 23:16:50 2009
New Revision: 816005
URL: http://svn.apache.org/viewvc?rev=816005&view=rev
Log:
As noted by Guenter Knauf, correct comparison issue due to signedness of char
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=816005&r1=816004&r2=816005&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Wed Sep 16 23:16:50 2009
@@ -241,9 +241,9 @@
* is explicitly not allowed, we make no effort to catch such.
*/
for (ssrc = sdst = pbuf; ssrc < last_char; ++ssrc, ++sdst) {
- if ((ssrc[0] == 0xff)
+ if ((ssrc[0] == '\xFF')
|| (ssrc[0] == APR_ASCII_CR && ssrc[1] == 0)) {
- if (ssrc[0] == 0xff && ssrc[1] != 0xff)
+ if (ssrc[0] == '\xFF' && ssrc[1] != '\xFF')
--sdst;
break;
}
@@ -252,10 +252,10 @@
*/
for (ssrc += 2, ++sdst; ssrc < last_char; ++ssrc) {
*(sdst++) = *ssrc;
- if ((ssrc[0] == 0xff)
+ if ((ssrc[0] == '\xFF')
|| (ssrc[0] == APR_ASCII_CR && ssrc[1] == 0)) {
++ssrc;
- if (ssrc[0] == 0xff && ssrc[1] != 0xff)
+ if (ssrc[0] == '\xFF' && ssrc[1] != '\xFF')
--sdst;
}
}