strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fill in some sane defaults on read/write failure

Browse source
This commit is contained in:
Caolán McNamara 2012-04-21 22:24:03 +01:00
parent 6ef852f160
commit e37ae322b0
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/source/nsplugin/source/npshell.cxx
View file

@ -761,7 +761,7 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
return;
}
char buffer[NPP_BUFFER_SIZE] = {0};
int ret;
ssize_t ret;
while(0 <= (ret = read(fdSrc, buffer, NPP_BUFFER_SIZE)))
{
if (0 == ret)
@ -773,8 +773,10 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
break;
}
ssize_t written_bytes = write(fdDst, buffer, ret);
if (written_bytes == -1)
if (written_bytes != ret)
{
debug_fprintf(NSP_LOG_APPEND, "NPP_StreamAsFile:short write to %s. error: %s \n",
localPathNew, strerror(errno));
return;
}
}

29
extensions/source/scanner/sane.cxx
View file

@ -526,21 +526,20 @@ static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
// as we do
size_t items_read = fread( &nWord, 1, 2, fp );
// fread() does not distinguish between end-of-file and error, and callers
// must use feof(3) and ferror(3) to determine which occurred.
if (items_read == 0)
if (items_read != 2)
{
// nothing todo?
// WaE is happy!
SAL_WARN( "extensions.scanner", "short read, abandoning" );
return 0;
}
return (sal_uInt8)( nWord / 256 );
}
sal_uInt8 nByte;
size_t items_read = fread( &nByte, 1, 1, fp );
if (items_read == 0)
if (items_read != 1)
{
// nothing todo?
// WaE is happy!
SAL_WARN( "extensions.scanner", "short read, abandoning" );
return 0;
}
return nByte;
}
@ -819,22 +818,18 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 1084 );
}
for( nLine = nHeight-1;
nLine >= 0; nLine-- )
for (nLine = nHeight-1; nLine >= 0; --nLine)
{
fseek( pFrame, nLine * aParams.bytes_per_line, SEEK_SET );
if( eType == FrameStyle_BW ||
( eType == FrameStyle_Gray && aParams.depth == 8 )
)
{
size_t items_read = fread( pBuffer, 1, aParams.bytes_per_line, pFrame );
// fread() does not distinguish between end-of-file and error, and callers
// must use feof(3) and ferror(3) to determine which occurred.
if (items_read == 0)
SANE_Int items_read = fread( pBuffer, 1, aParams.bytes_per_line, pFrame );
if (items_read != aParams.bytes_per_line)
{
// nothing todo?
// WaE is happy!
SAL_WARN( "extensions.scanner", "short read, padding with zeros" );
memset(pBuffer + items_read, 0, aParams.bytes_per_line - items_read);
}
aConverter.Write( pBuffer, aParams.bytes_per_line );
}