Merge pull request #327 from matthuisman/fix_logging_omega

phunkyfish · web-flow · commit 6a27b4fc98d9 · 2025-06-19T13:06:20.000+01:00
Fix logging (Crash on % user-agents) [Omega]
diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="21.3.7"
+  version="21.3.8"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>
diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt
@@ -1,3 +1,6 @@
+v21.3.6
+- Fix crashing when % in headers caused by missing kodi::Log format arg
+
 v21.3.5
 - Update depednencies to fix building on apple silicon (gnutls 3.8.4) and binutils on linux (2.41 or higher)
 
diff --git a/src/StreamManager.cpp b/src/StreamManager.cpp
@@ -49,7 +49,7 @@ void Log(const LogLevel logLevel, const char* format, ...)
   va_start(args, format);
   vsnprintf(buffer, sizeof(buffer), format, args);
   va_end(args);
-  kodi::Log(addonLevel, buffer);
+  kodi::Log(addonLevel, "%s", buffer);
 }
 
 InputStreamFFmpegDirect::InputStreamFFmpegDirect(const kodi::addon::IInstanceInfo& instance)

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +v21.3.6
 +- Fix crashing when % in headers caused by missing kodi::Log format arg
++
 v21.3.5
 - Update depednencies to fix building on apple silicon (gnutls 3.8.4) and binutils on linux (2.41 or higher)
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void Log(const LogLevel logLevel, const char* format, ...)`
`49`	`49`	`va_start(args, format);`
`50`	`50`	`vsnprintf(buffer, sizeof(buffer), format, args);`
`51`	`51`	`va_end(args);`
`52`		`- kodi::Log(addonLevel, buffer);`
	`52`	`+ kodi::Log(addonLevel, "%s", buffer);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`InputStreamFFmpegDirect::InputStreamFFmpegDirect(const kodi::addon::IInstanceInfo& instance)`