sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6089 from elpaso/server-exception-on-image-overflow

Browse Source 
Server exception on image overflow
This commit is contained in:
Alessandro Pasotti 2018-01-17 17:34:29 +01:00 committed by GitHub
commit 479358ea77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -1041,7 +1041,7 @@ namespace QgsWms
throw QgsException( QStringLiteral( "createImage: Invalid width / height parameters" ) );
}
QImage *image = nullptr;
std::unique_ptr<QImage> image;
// use alpha channel only if necessary because it slows down performance
QgsWmsParameters::Format format = mWmsParameters.format();
@ -1049,15 +1049,21 @@ namespace QgsWms
if ( transparent && format != QgsWmsParameters::JPG )
{
image = new QImage( width, height, QImage::Format_ARGB32_Premultiplied );
image = qgis::make_unique<QImage>( width, height, QImage::Format_ARGB32_Premultiplied );
image->fill( 0 );
}
else
{
image = new QImage( width, height, QImage::Format_RGB32 );
image = qgis::make_unique<QImage>( width, height, QImage::Format_RGB32 );
image->fill( mWmsParameters.backgroundColorAsColor() );
}
// Check that image was correctly created
if ( image->isNull() )
{
throw QgsException( QStringLiteral( "createImage: image could not be created, check for out of memory conditions" ) );
}
//apply DPI parameter if present. This is an extension of Qgis Mapserver compared to WMS 1.3.
//Because of backwards compatibility, this parameter is optional
double OGC_PX_M = 0.00028; // OGC reference pixel size in meter, also used by qgis
@ -1067,7 +1073,7 @@ namespace QgsWms
image->setDotsPerMeterX( dpm );
image->setDotsPerMeterY( dpm );
return image;
return image.release();
}
void QgsRenderer::configureMapSettings( const QPaintDevice *paintDevice, QgsMapSettings &mapSettings ) const
@ -1830,6 +1836,31 @@ namespace QgsWms
return false;
}
// Sanity check from internal QImage checks (see qimage.cpp)
// this is to report a meaningful error message in case of
// image creation failure and to differentiate it from out
// of memory conditions.
// depth for now it cannot be anything other than 32, but I don't like
// to hardcode it: I hope we will support other depths in the future.
uint depth = 32;
switch ( mWmsParameters.format() )
{
case QgsWmsParameters::Format::JPG:
case QgsWmsParameters::Format::PNG:
default:
depth = 32;
}
const int bytes_per_line = ( ( width * depth + 31 ) >> 5 ) << 2; // bytes per scanline (must be multiple of 4)
if ( std::numeric_limits<int>::max() / depth < ( uint )width
|| bytes_per_line <= 0
|| height <= 0
|| std::numeric_limits<int>::max() / uint( bytes_per_line ) < ( uint )height
|| std::numeric_limits<int>::max() / sizeof( uchar * ) < uint( height ) )
return false;
return true;
}

2
tests/src/python/qgis_wrapped_server.py
View File

@ -166,6 +166,8 @@ class Handler(BaseHTTPRequestHandler):
headers = {}
for k, v in self.headers.items():
headers['HTTP_%s' % k.replace(' ', '-').replace('-', '_').replace(' ', '-').upper()] = v
if not self.path.startswith('http'):
self.path = "%s://%s:%s%s" % ('https' if https else 'http', QGIS_SERVER_HOST, QGIS_SERVER_PORT, self.path)
request = QgsBufferServerRequest(self.path, (QgsServerRequest.PostMethod if post_body is not None else QgsServerRequest.GetMethod), headers, post_body)
response = QgsBufferServerResponse()
qgs_server.handleRequest(request, response)