Merge pull request xbmc#25291 from thexai/smb-limit-chunksize

[FileSystem] limit SMB chunk size to 64 KB for SMBv1
thexai · Jun 2, 2024 · c2ef7ac · c2ef7ac
2 parents b36eb9a + 12d667f
commit c2ef7ac
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/xbmc/platform/posix/filesystem/SMBFile.cpp b/xbmc/platform/posix/filesystem/SMBFile.cpp
@@ -746,5 +746,17 @@ int CSMBFile::GetChunkSize()
 {
   const auto settings = CServiceBroker::GetSettingsComponent()->GetSettings();
 
-  return settings ? (settings->GetInt(CSettings::SETTING_SMB_CHUNKSIZE) * 1024) : (128 * 1024);
+  if (!settings)
+    return (64 * 1024);
+
+  int chunkSize = settings->GetInt(CSettings::SETTING_SMB_CHUNKSIZE) * 1024;
+
+  if (settings->GetInt(CSettings::SETTING_SMB_MINPROTOCOL) == 1 &&
+      settings->GetInt(CSettings::SETTING_SMB_MAXPROTOCOL) == 1)
+  {
+    if (chunkSize > 64 * 1024)
+      chunkSize = 64 * 1024;
+  }
+
+  return chunkSize;
 }