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

msvcp90: Don't crash if NULL is passed to _Strcoll and _Wcscoll.

This commit is contained in:
Piotr Caban 2011-12-21 15:59:50 +01:00 committed by Alexandre Julliard
parent 1a711acdc2
commit cd6e9bd141
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/msvcp90/locale.c
View File

@ -34,6 +34,7 @@ char* __cdecl _Getdays(void);
char* __cdecl _Getmonths(void); char* __cdecl _Getmonths(void);
void* __cdecl _Gettnames(void); void* __cdecl _Gettnames(void);
unsigned int __cdecl ___lc_codepage_func(void); unsigned int __cdecl ___lc_codepage_func(void);
LCID* __cdecl ___lc_handle_func(void);
typedef int category; typedef int category;
@ -746,8 +747,15 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca
int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2,
const char *last2, const _Collvec *coll) const char *last2, const _Collvec *coll)
{ {
LCID lcid;
TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2)); TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2));
return CompareStringA(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2;
if(coll)
lcid = coll->handle;
else
lcid = ___lc_handle_func()[LC_COLLATE];
return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-2;
} }
/* ?do_compare@?$collate@D@std@@MBEHPBD000@Z */ /* ?do_compare@?$collate@D@std@@MBEHPBD000@Z */
@ -992,8 +1000,15 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc
int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2,
const wchar_t *last2, const _Collvec *coll) const wchar_t *last2, const _Collvec *coll)
{ {
LCID lcid;
TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2));
return CompareStringW(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2;
if(coll)
lcid = coll->handle;
else
lcid = ___lc_handle_func()[LC_COLLATE];
return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-2;
} }
/* ?do_compare@?$collate@_W@std@@MBEHPB_W000@Z */ /* ?do_compare@?$collate@_W@std@@MBEHPB_W000@Z */