msacm32: Use a helper to validate stream pointers.

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msacm32: Use a helper to validate stream pointers.
37f159e1 · Bruno Jesus · Alexandre Julliard · d4fd43c9 · 37f159e1
Commit 37f159e1 authored Aug 28, 2016 by Bruno Jesus Committed by Alexandre Julliard Aug 29, 2016
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

stream.c dlls/msacm32/stream.c +11 -10

No files found.
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -50,6 +50,15 @@ static PWINE_ACMSTREAM	ACM_GetStream(HACMSTREAM has)
    return (PWINE_ACMSTREAM)has;
 }

+static BOOL ACM_ValidatePointers(PACMDRVSTREAMHEADER padsh)
+{
+    /* check that pointers have not been modified */
+    return !(padsh->pbPreparedSrc != padsh->pbSrc ||
+             padsh->cbPreparedSrcLength < padsh->cbSrcLength ||
+             padsh->pbPreparedDst != padsh->pbDst ||
+             padsh->cbPreparedDstLength < padsh->cbDstLength);
+}
+
 /***********************************************************************
 *           acmStreamClose (MSACM32.@)
 */
@@ -108,11 +117,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
     */
    padsh = (PACMDRVSTREAMHEADER)pash;

-    /* check that pointers have not been modified */
-    if (padsh->pbPreparedSrc != padsh->pbSrc ||
-	padsh->cbPreparedSrcLength < padsh->cbSrcLength ||
-	padsh->pbPreparedDst != padsh->pbDst ||
-	padsh->cbPreparedDstLength < padsh->cbDstLength) {
+    if (!ACM_ValidatePointers(padsh)) {
        WARN("invalid parameter\n");
        return MMSYSERR_INVALPARAM;
    }
@@ -467,11 +472,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
     */
    padsh = (PACMDRVSTREAMHEADER)pash;

-    /* check that pointers have not been modified */
-    if (padsh->pbPreparedSrc != padsh->pbSrc ||
-	padsh->cbPreparedSrcLength < padsh->cbSrcLength ||
-	padsh->pbPreparedDst != padsh->pbDst ||
-	padsh->cbPreparedDstLength < padsh->cbDstLength) {
+    if (!ACM_ValidatePointers(padsh)) {
        WARN("invalid parameter\n");
        return MMSYSERR_INVALPARAM;
    }