ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not HeapFree() memory not allocated by us in COMBO_GetText. 

Convert return value from LB_GETTEXT into COMBO_GetText.
This commit is contained in:
Marcus Meissner 2001-05-02 01:08:59 +00:00 committed by Alexandre Julliard
parent 3ee02babac
commit f05618bd00
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controls/combo.c
View File

@ -1498,6 +1498,9 @@ static LRESULT COMBO_ItemOp( LPHEADCOMBO lphc, UINT msg, LPARAM lParam )
/*********************************************************************** /***********************************************************************
* COMBO_GetText * COMBO_GetText
*
* NOTE! LB_GETTEXT does not count terminating \0, WM_GETTEXT does.
* also LB_GETTEXT might return values < 0, WM_GETTEXT doesn't.
*/ */
static LRESULT COMBO_GetText( LPHEADCOMBO lphc, INT N, LPARAM lParam, BOOL unicode) static LRESULT COMBO_GetText( LPHEADCOMBO lphc, INT N, LPARAM lParam, BOOL unicode)
{ {
@ -1539,10 +1542,10 @@ static LRESULT COMBO_GetText( LPHEADCOMBO lphc, INT N, LPARAM lParam, BOOL unico
strncpyW(lpText, lpBuffer, (N > n) ? n+1 : N-1); strncpyW(lpText, lpBuffer, (N > n) ? n+1 : N-1);
lpText[N - 1] = '\0'; lpText[N - 1] = '\0';
} }
}
HeapFree( GetProcessHeap(), 0, lpBuffer ); HeapFree( GetProcessHeap(), 0, lpBuffer );
} }
} }
}
else else
{ {
LPSTR lpBuffer, lpText = (LPSTR)lParam; LPSTR lpBuffer, lpText = (LPSTR)lParam;
@ -1566,10 +1569,14 @@ static LRESULT COMBO_GetText( LPHEADCOMBO lphc, INT N, LPARAM lParam, BOOL unico
strncpy(lpText, lpBuffer, (N > n) ? n+1 : N-1); strncpy(lpText, lpBuffer, (N > n) ? n+1 : N-1);
lpText[N - 1] = '\0'; lpText[N - 1] = '\0';
} }
}
HeapFree( GetProcessHeap(), 0, lpBuffer ); HeapFree( GetProcessHeap(), 0, lpBuffer );
} }
} }
}
if (n<0)
n=0;
else
n++;
return (LRESULT)n; return (LRESULT)n;
} }
} }