D385.id.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D385.id.diff
View Options

	Index: gpgme-1.7.0/src/w32-util.c
	===================================================================
	--- gpgme-1.7.0/src/w32-util.c
	+++ gpgme-1.7.0/src/w32-util.c
	@@ -414,8 +414,26 @@
	We First try the generic place and then fallback to the x86
	(i.e. 32 bit) place. This will prefer a 64 bit of the program
	over a 32 bit version on 64 bit Windows if installed. */
	- if (SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILES, 0)
	- \|\| SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILESX86, 0))
	+ if (SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILES, 0))
	+ {
	+ result = malloc (strlen (path) + 1 + strlen (name) + 1);
	+ if (result)
	+ {
	+ strcpy (stpcpy (stpcpy (result, path), "\\"), name);
	+ if (access (result, F_OK))
	+ {
	+ free (result);
	+ result = NULL;
	+ }
	+ }
	+ }
	+
	+ if (result != NULL)
	+ {
	+ return result;
	+ }
	+
	+ if (SHGetSpecialFolderPathA (NULL, path, CSIDL_PROGRAM_FILESX86, 0))
	{
	result = malloc (strlen (path) + 1 + strlen (name) + 1);
	if (result)