[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:03:08 UTC 2012
The following commit has been merged in the wheezy branch:
commit 7bd33bf69673dd0af4ae5b5f1e56bbf71da9513f
Author: Carlo Bramini <carlo.bramix at libero.it>
Date: Mon Apr 9 23:55:53 2012 +0200
shlwapi: Don't remove nonexistent extension in PathRemoveExtension.
(cherry picked from commit f9c9ea6343daf1fbd587d4718b48371ad1bef5a3)
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index 92a830b..6f09d22 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -760,6 +760,10 @@ void WINAPI PathRemoveArgsW(LPWSTR lpszPath)
* PARAMS
* lpszPath [I/O] Path to remove the extension from
*
+ * NOTES
+ * The NUL terminator must be written only if extension exists
+ * and if the pointed character is not already NUL.
+ *
* RETURNS
* Nothing.
*/
@@ -770,7 +774,8 @@ void WINAPI PathRemoveExtensionA(LPSTR lpszPath)
if (lpszPath)
{
lpszPath = PathFindExtensionA(lpszPath);
- *lpszPath = '\0';
+ if (lpszPath && *lpszPath != '\0')
+ *lpszPath = '\0';
}
}
@@ -786,7 +791,8 @@ void WINAPI PathRemoveExtensionW(LPWSTR lpszPath)
if (lpszPath)
{
lpszPath = PathFindExtensionW(lpszPath);
- *lpszPath = '\0';
+ if (lpszPath && *lpszPath != '\0')
+ *lpszPath = '\0';
}
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list