sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- avoid a segmentation fault when an error occurred in oracle sql query

Browse source
This commit is contained in:
kunitoki 2013-03-06 12:48:34 +01:00
parent e703629b47
commit ad6fe5ae55
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/occi/occi_featureset.cpp
View file

@ -77,7 +77,7 @@ occi_featureset::occi_featureset(StatelessConnectionPool* pool,
try
{
rs_ = conn_.execute_query(sqlstring, prefetch_rows);
rs_.reset(conn_.execute_query(sqlstring, prefetch_rows));
}
catch (SQLException &ex)
{
@ -91,9 +91,9 @@ occi_featureset::~occi_featureset()
feature_ptr occi_featureset::next()
{
if (rs_ && rs_->next())
if (rs_ != NULL && rs_->next())
{
feature_ptr feature(feature_factory::create(ctx_,feature_id_));
feature_ptr feature(feature_factory::create(ctx_, feature_id_));
++feature_id_;
if (use_wkb_)
@ -101,13 +101,13 @@ feature_ptr occi_featureset::next()
Blob blob = rs_->getBlob(1);
blob.open(oracle::occi::OCCI_LOB_READONLY);
int size = blob.length();
unsigned int size = blob.length();
if (buffer_.size() < size)
{
buffer_.resize(size);
}
oracle::occi::Stream* instream = blob.getStream(1,0);
oracle::occi::Stream* instream = blob.getStream(1, 0);
instream->readBuffer(buffer_.data(), size);
blob.closeStream(instream);
blob.close();

2
plugins/input/occi/occi_featureset.hpp
View file

@ -69,7 +69,7 @@ private:
const bool is_point_geom);
occi_connection_ptr conn_;
oracle::occi::ResultSet* rs_;
boost::shared_ptr<oracle::occi::ResultSet> rs_;
boost::scoped_ptr<mapnik::transcoder> tr_;
mapnik::value_integer feature_id_;
mapnik::context_ptr ctx_;