Commit 97d051ed authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

bug 29815 linux build x2t

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63637 954022d7-b5bf-4e40-9824-e11837661b57
parent 0e70539c
#pragma once #pragma once
//2 //2
//0 //0
//1 //2
//328 //328
#define INTVER 2,0,1,328 #define INTVER 2,0,2,328
#define STRVER "2,0,1,328\0" #define STRVER "2,0,2,328\0"
...@@ -462,7 +462,7 @@ namespace NSFontConverter ...@@ -462,7 +462,7 @@ namespace NSFontConverter
if ( m_oPrivateDict.nLenIV > 0 && m_oPrivateDict.nLenIV < nLength ) if ( m_oPrivateDict.nLenIV > 0 && m_oPrivateDict.nLenIV < nLength )
{ {
Type1Charstring& oCharstring = DecodeCharString( sData + m_oPrivateDict.nLenIV, nLength - m_oPrivateDict.nLenIV ); Type1Charstring oCharstring = DecodeCharString( sData + m_oPrivateDict.nLenIV, nLength - m_oPrivateDict.nLenIV );
if ( bGlyphsSection ) if ( bGlyphsSection )
{ {
int nUnicode = Type1NameToUnicodeW( sGlyph.c_str() ); int nUnicode = Type1NameToUnicodeW( sGlyph.c_str() );
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
#include <limits> #include <limits>
#include <string> #include <string>
#ifdef __linux__
#include <string.h>
#endif
namespace NSFontConverter namespace NSFontConverter
{ {
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -59,7 +63,7 @@ namespace NSFontConverter ...@@ -59,7 +63,7 @@ namespace NSFontConverter
return NULL; return NULL;
int nSize = nObjectsCount * nObjectSize; int nSize = nObjectsCount * nObjectSize;
if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= INT_MAX / nObjectSize ) if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= 0x7fffffff / nObjectSize )
{ {
// TO DO: Выдать ошибку выделения памяти // TO DO: Выдать ошибку выделения памяти
} }
...@@ -83,7 +87,7 @@ namespace NSFontConverter ...@@ -83,7 +87,7 @@ namespace NSFontConverter
} }
int nSize = nObjectsCount * nObjectSize; int nSize = nObjectsCount * nObjectSize;
if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= INT_MAX / nObjectSize ) if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= 0x7fffffff / nObjectSize )
{ {
// TO DO: Выдать ошибку выделения памяти // TO DO: Выдать ошибку выделения памяти
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment