Merge pull request #326 from matthuisman/fix_logging

phunkyfish · web-flow · commit 9d85392bef2a · 2025-06-19T13:08:26.000+01:00
Fix logging (Crash on % user-agents) [Piers]
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="22.1.1"
+  version="22.1.2"
   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,7 @@
+v22.1.2
+- Fix crashing when % in headers caused by missing kodi::Log format arg
+- Fix building of openssl on windows caused by missing strawberryperl in path
+
 v22.1.1
 - Move CVariant to ffmpegdirect namespace to avoid collision with CVariant in Kodi, which causes random crashes when playing streams with this addon.
 
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 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)`