Return previously seen input reports even if neutralization fails, bu…

…t return 0 bytes read.
SpecialKO · Dec 29, 2024 · a540db1 · a540db1
1 parent 8eb17d4
commit a540db1
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/input/hid.cpp b/src/input/hid.cpp
@@ -1699,16 +1699,16 @@ GetOverlappedResultEx_Detour (HANDLE       hFile,
           {
             if (hid_file->neutralizeHidInput (report_id, dwSize))
             {
-              SK_UNTRUSTED_memcpy (
-                overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
-              );
               neutralized = true;
             }
+
+            SK_UNTRUSTED_memcpy (
+              overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
+            );
           }
 
           if (! neutralized)
           {
-            memset (overlapped_request.lpBuffer, 0, dwSize);
             *lpNumberOfBytesTransferred = 0;
           }
         }
@@ -1765,16 +1765,16 @@ GetOverlappedResultEx_Detour (HANDLE       hFile,
             {
               if (hid_file->neutralizeHidInput (report_id, dwSize))
               {
-                SK_UNTRUSTED_memcpy (
-                  overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
-                );
                 neutralized = true;
               }
+
+              SK_UNTRUSTED_memcpy (
+                overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
+              );
             }
 
             if (! neutralized)
             {
-              memset (overlapped_request.lpBuffer, 0, dwSize);
               dwSize = 0;
             }
           }
@@ -1865,16 +1865,16 @@ GetOverlappedResult_Detour (HANDLE       hFile,
           {
             if (hid_file->neutralizeHidInput (report_id, dwSize))
             {
-              SK_UNTRUSTED_memcpy (
-                overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
-              );
               neutralized = true;
             }
+
+            SK_UNTRUSTED_memcpy (
+              overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
+            );
           }
 
           if (! neutralized)
           {
-            memset (overlapped_request.lpBuffer, 0, dwSize);
             *lpNumberOfBytesTransferred = 0;
           }
         }
@@ -1931,16 +1931,16 @@ GetOverlappedResult_Detour (HANDLE       hFile,
             {
               if (hid_file->neutralizeHidInput (report_id, dwSize))
               {
-                SK_UNTRUSTED_memcpy (
-                  overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
-                );
                 neutralized = true;
               }
+
+              SK_UNTRUSTED_memcpy (
+                overlapped_request.lpBuffer, hid_file->_cachedInputReportsByReportId [report_id].data (), dwSize
+              );
             }
 
             if (! neutralized)
             {
-              memset (overlapped_request.lpBuffer, 0, dwSize);
               dwSize = 0;
             }
           }