diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
| commit | aa0fcb15afd952144967d873bfc7b86d93973192 (patch) | |
| tree | e657bb26128e8b1ba27353504bdbe7d2b4e3da98 /cpp/src/IcePatch2/FileServerI.cpp | |
| parent | Got rid of redundant #ifdef. (Bug 2429.) (diff) | |
| download | ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.bz2 ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.xz ice-aa0fcb15afd952144967d873bfc7b86d93973192.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2719
Squashed commit of the following:
commit 5ff1fac3e73ef4fb3ac96a692812a849ff585ebc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Mar 18 01:27:20 2008 -0800
Fixed the various && || warnings from gcc.
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index 8cae21bcec1..49c6423df41 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -76,7 +76,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp if(path == ".." || path.find("/../") != string::npos || - path.size() >= 3 && (path.substr(0, 3) == "../" || path.substr(path.size() - 3, 3) == "/..")) + (path.size() >= 3 && (path.substr(0, 3) == "../" || path.substr(path.size() - 3, 3) == "/.."))) { FileAccessException ex; ex.reason = "illegal `..' component in path `" + path + "'"; |