mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
Mythes: fix -Wsign-compare warning
Will also urge to get this into upstream
This commit is contained in:
parent
3edacc85ed
commit
8c2e5bfc20
6
3rdparty/mythes/1.2.5/mythes.cxx
vendored
6
3rdparty/mythes/1.2.5/mythes.cxx
vendored
@ -48,7 +48,8 @@ int MyThes::thInitialize(const char* idxpath, const char* datpath)
|
|||||||
readLine(pifile,wrd,MAX_WD_LEN);
|
readLine(pifile,wrd,MAX_WD_LEN);
|
||||||
int idxsz = atoi(wrd);
|
int idxsz = atoi(wrd);
|
||||||
|
|
||||||
if (idxsz <= 0 || idxsz > std::numeric_limits<int>::max() / sizeof(char*)) {
|
// spitz: fix -Wsign-compare warning
|
||||||
|
if (idxsz <= 0 || static_cast<unsigned int>(idxsz) > std::numeric_limits<int>::max() / sizeof(char*)) {
|
||||||
fprintf(stderr,"Error - bad index %d\n", idxsz);
|
fprintf(stderr,"Error - bad index %d\n", idxsz);
|
||||||
fclose(pifile);
|
fclose(pifile);
|
||||||
return 0;
|
return 0;
|
||||||
@ -176,7 +177,8 @@ int MyThes::Lookup(const char * pText, int len, mentry** pme)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
int nmeanings = atoi(buf+np+1);
|
int nmeanings = atoi(buf+np+1);
|
||||||
if (nmeanings < 0 || nmeanings > std::numeric_limits<int>::max() / sizeof(mentry))
|
// spitz: fix -Wsign-compare warning
|
||||||
|
if (nmeanings < 0 || static_cast<unsigned int>(nmeanings) > std::numeric_limits<int>::max() / sizeof(mentry))
|
||||||
nmeanings = 0;
|
nmeanings = 0;
|
||||||
*pme = (mentry*)(nmeanings ? malloc(nmeanings * sizeof(mentry)) : NULL);
|
*pme = (mentry*)(nmeanings ? malloc(nmeanings * sizeof(mentry)) : NULL);
|
||||||
if (!(*pme)) {
|
if (!(*pme)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user