Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2019-10-17 13:04:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools" Thu Oct 17 13:04:39 2019 rev:88 rq:737499 version:11.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2019-10-05 16:19:56.277494604 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new.2352/open-vm-tools.changes 2019-10-17 13:04:41.812482244 +0200 @@ -1,0 +2,13 @@ +Fri Oct 11 11:47:05 UTC 2019 - Bjørn Lie <[email protected]> + +- Add gcc9-static-inline.patch: Fix static inline when building + with gcc9. + +------------------------------------------------------------------- +Wed Oct 9 14:02:35 UTC 2019 - Kirk Allan <[email protected]> + +- Fix memory leak in VixToolsListAuthAliases and VixToolsListMappedAliases. + (bsc#1153271) + + Add patch fix-leaks-Aliases-MappedAliases.patch + +------------------------------------------------------------------- New: ---- fix-leaks-Aliases-MappedAliases.patch gcc9-static-inline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.nCRBRk/_old 2019-10-17 13:04:42.556480327 +0200 +++ /var/tmp/diff_new_pack.nCRBRk/_new 2019-10-17 13:04:42.560480317 +0200 @@ -161,6 +161,8 @@ Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) ExclusiveArch: %ix86 x86_64 #Upstream patches +Patch0: fix-leaks-Aliases-MappedAliases.patch +Patch1: gcc9-static-inline.patch %systemd_requires @@ -227,6 +229,8 @@ # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README #Upstream patches +%patch0 -p2 +%patch1 -p2 %build %if %{with_X} @@ -391,7 +395,8 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/vmtoolsd %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins ++++++ fix-leaks-Aliases-MappedAliases.patch ++++++ commit 9bc72f0b09702754b429115658a85223cb3058bd Author: Oliver Kurth <[email protected]> Date: Wed Oct 2 17:48:35 2019 -0700 Fix leaks in ListAliases and ListMappedAliases. The 'record' for each alias was being leaked. diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c index 6352b915..9ba55073 100644 --- a/open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -9762,7 +9762,6 @@ VixToolsListAuthAliases(VixCommandReques char *destPtr; char *endDestPtr; char *tmpBuf = NULL; - char *recordBuf; size_t recordSize; char *escapedStr = NULL; char *escapedStr2 = NULL; @@ -9822,6 +9821,8 @@ VixToolsListAuthAliases(VixCommandReques destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s", VIX_XML_ESCAPED_TAG); for (i = 0; i < num; i++) { + char *recordBuf = NULL; + escapedStr = VixToolsEscapeXMLString(uaList[i].pemCert); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; @@ -9895,6 +9896,8 @@ VixToolsListAuthAliases(VixCommandReques Log("%s: ListAuth list results too large, truncating", __FUNCTION__); goto abort; } + free(recordBuf); + recordBuf = NULL; } *result = resultBuffer; @@ -9960,7 +9963,6 @@ VixToolsListMappedAliases(VixCommandRequ char *destPtr; char *endDestPtr; char *tmpBuf = NULL; - char *recordBuf; char *escapedStr = NULL; char *escapedStr2 = NULL; size_t recordSize; @@ -10014,6 +10016,8 @@ VixToolsListMappedAliases(VixCommandRequ destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s", VIX_XML_ESCAPED_TAG); for (i = 0; i < num; i++) { + char *recordBuf = NULL; + escapedStr = VixToolsEscapeXMLString(maList[i].pemCert); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; @@ -10085,6 +10089,8 @@ VixToolsListMappedAliases(VixCommandRequ Log("%s: ListMapped results too large, truncating", __FUNCTION__); goto abort; } + free(recordBuf); + recordBuf = NULL; } *result = resultBuffer; ++++++ gcc9-static-inline.patch ++++++ diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h index f9acc6a29..deefd1f3d 100644 --- a/open-vm-tools/lib/include/vmware/tools/plugin.h +++ b/open-vm-tools/lib/include/vmware/tools/plugin.h @@ -290,7 +290,7 @@ typedef struct ToolsAppCtx { * * @return TRUE if COM is initialized when the function returns. */ -G_INLINE_FUNC gboolean +static inline gboolean ToolsCore_InitializeCOM(ToolsAppCtx *ctx) { if (!ctx->comInitialized) { diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h index 3f2082b3e..5880fbcff 100644 --- a/open-vm-tools/lib/include/vmware/tools/threadPool.h +++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h @@ -91,7 +91,7 @@ typedef struct ToolsCorePool { ******************************************************************************* */ -G_INLINE_FUNC ToolsCorePool * +static inline ToolsCorePool * ToolsCorePool_GetPool(ToolsAppCtx *ctx) { ToolsCorePool *pool = NULL; @@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx) ******************************************************************************* */ -G_INLINE_FUNC guint +static inline guint ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, ToolsCorePoolCb cb, gpointer data, @@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, ******************************************************************************* */ -G_INLINE_FUNC void +static inline void ToolsCorePool_CancelTask(ToolsAppCtx *ctx, guint taskId) { @@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx, ******************************************************************************* */ -G_INLINE_FUNC gboolean +static inline gboolean ToolsCorePool_StartThread(ToolsAppCtx *ctx, const gchar *threadName, ToolsCorePoolCb cb, diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h index f65745906..a3292d5c0 100644 --- a/open-vm-tools/lib/include/vmware/tools/utils.h +++ b/open-vm-tools/lib/include/vmware/tools/utils.h @@ -51,15 +51,6 @@ # include <sys/time.h> #endif - -/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */ -#if defined(G_PLATFORM_WIN32) -# if defined(G_INLINE_FUNC) -# undef G_INLINE_FUNC -# endif -# define G_INLINE_FUNC static __inline -#endif - #ifndef ABS # define ABS(x) (((x) >= 0) ? (x) : -(x)) #endif
