commit cdb6933fd1ac112af205080f4269936fc6c1e177
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 01:09:50 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 01:09:50 2022 +0000
tree 209035c24d51e2e937dbc18fce9e1ac8892ac3f2
parent 5113f495352e374a0954bdda509fe357f0e8673a
parent f702019345e5312e8bd82e47548783bfbcf515b4

Snap for 8422005 from f702019345e5312e8bd82e47548783bfbcf515b4 to tm-release

Change-Id: I6d505390c4b54c2c97d078e169b883db6af5a645

client/file_sync_client.cpp

diff --git a/client/file_sync_client.cpp b/client/file_sync_client.cpp
index 1b1dfa8..5a587db 100644
--- a/client/file_sync_client.cpp
+++ b/client/file_sync_client.cpp
@@ -544,15 +544,17 @@
 
             if (!ReadFdExactly(fd, buf, len)) return false;
             buf[len] = 0;
-
-            // Address the highly unlikely scenario wherein a
+            // Address the unlikely scenario wherein a
             // compromised device/service might be able to
             // traverse across directories on the host. Let's
             // shut that door!
-            if (strchr(buf, '/')) {
+            if (strchr(buf, '/')
+#if defined(_WIN32)
+                || strchr(buf, '\\')
+#endif
+            ) {
                 return false;
             }
-
             callback(dent.mode, dent.size, dent.mtime, buf);
         }
     }