octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Remove some extraneous null pointer checks (fixes #234) 

There were a few places in the code that were checking that a pointer
wasn't null before deleting it, even though C++ has always allowed
delete 0. Most of the code did not perform these checks.
This commit is contained in:
Jay Berkenbilt 2018-08-12 12:58:39 -04:00
parent 4a4736c695
commit b6e414b10b
4 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libqpdf/ClosedFileInputSource.cc
View File

@ -11,10 +11,7 @@ ClosedFileInputSource::Members::Members(char const* filename) :
ClosedFileInputSource::Members::~Members()
{
if (fis)
{
delete fis;
}
delete fis;
}
ClosedFileInputSource::ClosedFileInputSource(char const* filename) :

7
libqpdf/Pl_Flate.cc
View File

@ -31,11 +31,8 @@ Pl_Flate::Pl_Flate(char const* identifier, Pipeline* next,
Pl_Flate::~Pl_Flate()
{
if (this->outbuf)
{
delete [] this->outbuf;
this->outbuf = 0;
}
delete [] this->outbuf;
this->outbuf = 0;
if (this->initialized)
{

14
libqpdf/Pl_RC4.cc
View File

@ -13,11 +13,8 @@ Pl_RC4::Pl_RC4(char const* identifier, Pipeline* next,
Pl_RC4::~Pl_RC4()
{
if (this->outbuf)
{
delete [] this->outbuf;
this->outbuf = 0;
}
delete [] this->outbuf;
this->outbuf = 0;
}
void
@ -47,10 +44,7 @@ Pl_RC4::write(unsigned char* data, size_t len)
void
Pl_RC4::finish()
{
if (this->outbuf)
{
delete [] this->outbuf;
this->outbuf = 0;
}
delete [] this->outbuf;
this->outbuf = 0;
this->getNext()->finish();
}

5
libqpdf/QPDFWriter.cc
View File

@ -75,10 +75,7 @@ QPDFWriter::Members::~Members()
{
fclose(file);
}
if (output_buffer)
{
delete output_buffer;
}
delete output_buffer;
}
QPDFWriter::QPDFWriter(QPDF& pdf) :