db2a8b
--- poppler/glib/poppler-document.cc
db2a8b
+++ poppler/glib/poppler-document.cc
db2a8b
@@ -2872,6 +2872,7 @@ poppler_document_get_form_field (Poppler
db2a8b
   unsigned fieldNum;
db2a8b
   FormPageWidgets *widgets;
db2a8b
   FormWidget *field;
db2a8b
+  PopplerFormField *formField;
db2a8b
 
db2a8b
   FormWidget::decodeID (id, &pageNum, &fieldNum);
db2a8b
 
db2a8b
@@ -2884,8 +2885,14 @@ poppler_document_get_form_field (Poppler
db2a8b
     return nullptr;
db2a8b
 
db2a8b
   field = widgets->getWidget (fieldNum);
db2a8b
-  if (field)
db2a8b
-    return _poppler_form_field_new (document, field);
db2a8b
+  if (field) {
db2a8b
+    formField = _poppler_form_field_new (document, field);
db2a8b
+    delete widgets;
db2a8b
+
db2a8b
+    return formField;
db2a8b
+  }
db2a8b
+
db2a8b
+  delete widgets;
db2a8b
 
db2a8b
   return nullptr;
db2a8b
 }
db2a8b
--- poppler/poppler/CairoOutputDev.cc
db2a8b
+++ poppler/poppler/CairoOutputDev.cc
db2a8b
@@ -3010,8 +3010,10 @@ void CairoOutputDev::setMimeData(GfxStat
db2a8b
 
db2a8b
   // colorspace in stream dict may be different from colorspace in jpx
db2a8b
   // data
db2a8b
-  if (strKind == strJPX && colorSpace)
db2a8b
+  if (strKind == strJPX && colorSpace) {
db2a8b
+    delete colorSpace;
db2a8b
     return;
db2a8b
+  }
db2a8b
 
db2a8b
   // only embed mime data for gray, rgb, and cmyk colorspaces.
db2a8b
   if (colorSpace) {
db2a8b
--- poppler/poppler/Link.cc
db2a8b
+++ poppler/poppler/Link.cc
db2a8b
@@ -193,6 +193,7 @@ LinkAction *LinkAction::parseAction(cons
db2a8b
           const Ref ref = obj3Ref.getRef();
db2a8b
           if (!seenNextActions->insert(ref.num).second) {
db2a8b
               error(errSyntaxWarning, -1, "parseAction: Circular next actions detected in array.");
db2a8b
+              delete actionList;
db2a8b
               return action;
db2a8b
           }
db2a8b
       }
db2a8b
--- poppler/poppler/SplashOutputDev.cc
db2a8b
+++ poppler/poppler/SplashOutputDev.cc
db2a8b
@@ -2207,6 +2207,8 @@ reload:
db2a8b
 	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
db2a8b
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
db2a8b
 	                         : "(unnamed)");
db2a8b
+	  if (fontsrc && fontsrc->isFile)
db2a8b
+	    fontsrc->unref();
db2a8b
 	  goto err2;
db2a8b
 	}
db2a8b
 	codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
db2a8b
@@ -2225,6 +2227,8 @@ reload:
db2a8b
       break;
db2a8b
     default:
db2a8b
       // this shouldn't happen
db2a8b
+      if (fontsrc && fontsrc->isFile)
db2a8b
+        fontsrc->unref();
db2a8b
       goto err2;
db2a8b
     }
db2a8b
     fontFile->doAdjustMatrix = doAdjustFontMatrix;
db2a8b
--- poppler/poppler/TextOutputDev.cc
db2a8b
+++ poppler/poppler/TextOutputDev.cc
db2a8b
@@ -1526,7 +1526,6 @@ TextBlock::~TextBlock() {
db2a8b
 }
db2a8b
 
db2a8b
 void TextBlock::addWord(TextWord *word) {
db2a8b
-  pool->addWord(word);
db2a8b
   if (xMin > xMax) {
db2a8b
     xMin = word->xMin;
db2a8b
     xMax = word->xMax;
db2a8b
@@ -1546,6 +1545,7 @@ void TextBlock::addWord(TextWord *word)
db2a8b
       yMax = word->yMax;
db2a8b
     }
db2a8b
   }
db2a8b
+  pool->addWord(word);
db2a8b
 }
db2a8b
 
db2a8b
 void TextBlock::coalesce(UnicodeMap *uMap, double fixedPitch) {
db2a8b
@@ -2999,11 +2999,13 @@ void TextPage::coalesce(GBool physLayout
db2a8b
       word0 = pool->getPool(startBaseIdx);
db2a8b
       pool->setPool(startBaseIdx, word0->next);
db2a8b
       word0->next = nullptr;
db2a8b
-      blk = new TextBlock(this, rot);
db2a8b
-      blk->addWord(word0);
db2a8b
 
db2a8b
       fontSize = word0->fontSize;
db2a8b
       minBase = maxBase = word0->base;
db2a8b
+
db2a8b
+      blk = new TextBlock(this, rot);
db2a8b
+      blk->addWord(word0);
db2a8b
+
db2a8b
       colSpace1 = minColSpacing1 * fontSize;
db2a8b
       colSpace2 = minColSpacing2 * fontSize;
db2a8b
       lineSpace = maxLineSpacingDelta * fontSize;
db2a8b
@@ -3037,9 +3039,9 @@ void TextPage::coalesce(GBool physLayout
db2a8b
 	      }
db2a8b
 	      word1 = word1->next;
db2a8b
 	      word2->next = nullptr;
db2a8b
+	      newMinBase = word2->base;
db2a8b
 	      blk->addWord(word2);
db2a8b
 	      found = gTrue;
db2a8b
-	      newMinBase = word2->base;
db2a8b
 	    } else {
db2a8b
 	      word0 = word1;
db2a8b
 	      word1 = word1->next;
db2a8b
@@ -3072,9 +3074,9 @@ void TextPage::coalesce(GBool physLayout
db2a8b
 	      }
db2a8b
 	      word1 = word1->next;
db2a8b
 	      word2->next = nullptr;
db2a8b
+	      newMaxBase = word2->base;
db2a8b
 	      blk->addWord(word2);
db2a8b
 	      found = gTrue;
db2a8b
-	      newMaxBase = word2->base;
db2a8b
 	    } else {
db2a8b
 	      word0 = word1;
db2a8b
 	      word1 = word1->next;
db2a8b
@@ -3171,12 +3173,12 @@ void TextPage::coalesce(GBool physLayout
db2a8b
 		}
db2a8b
 		word1 = word1->next;
db2a8b
 		word2->next = nullptr;
db2a8b
-		blk->addWord(word2);
db2a8b
 		if (word2->base < minBase) {
db2a8b
 		  minBase = word2->base;
db2a8b
 		} else if (word2->base > maxBase) {
db2a8b
 		  maxBase = word2->base;
db2a8b
 		}
db2a8b
+		blk->addWord(word2);
db2a8b
 		found = gTrue;
db2a8b
 		break;
db2a8b
 	      } else {
db2a8b
@@ -3235,12 +3237,12 @@ void TextPage::coalesce(GBool physLayout
db2a8b
 		}
db2a8b
 		word1 = word1->next;
db2a8b
 		word2->next = nullptr;
db2a8b
-		blk->addWord(word2);
db2a8b
 		if (word2->base < minBase) {
db2a8b
 		  minBase = word2->base;
db2a8b
 		} else if (word2->base > maxBase) {
db2a8b
 		  maxBase = word2->base;
db2a8b
 		}
db2a8b
+		blk->addWord(word2);
db2a8b
 		found = gTrue;
db2a8b
 		break;
db2a8b
 	      } else {
db2a8b
@@ -4509,7 +4511,7 @@ GooList **TextSelectionDumper::takeWordL
db2a8b
 class TextSelectionSizer : public TextSelectionVisitor {
db2a8b
 public:
db2a8b
   TextSelectionSizer(TextPage *page, double scale);
db2a8b
-  ~TextSelectionSizer() { }
db2a8b
+  ~TextSelectionSizer();
db2a8b
 
db2a8b
   void visitBlock (TextBlock *block,
db2a8b
 			   TextLine *begin,
db2a8b
@@ -4526,7 +4526,7 @@ public:
db2a8b
   void visitWord (TextWord *word, int begin, int end,
db2a8b
 			  PDFRectangle *selection) override { };
db2a8b
 
db2a8b
-  GooList *getRegion () { return list; }
db2a8b
+  GooList *getRegion ();
db2a8b
 
db2a8b
 private:
db2a8b
   GooList *list;
db2a8b
@@ -4538,6 +4540,11 @@ TextSelectionSizer::TextSelectionSizer(T
db2a8b
   list = new GooList();
db2a8b
 }
db2a8b
 
db2a8b
+TextSelectionSizer::~TextSelectionSizer()
db2a8b
+{
db2a8b
+  deleteGooList(list, PDFRectangle);
db2a8b
+}
db2a8b
+
db2a8b
 void TextSelectionSizer::visitLine (TextLine *line, 
db2a8b
 				    TextWord *begin,
db2a8b
 				    TextWord *end,
db2a8b
@@ -4594,6 +4594,21 @@ void TextSelectionSizer::visitLine (Text
db2a8b
   list->append (rect);
db2a8b
 }
db2a8b
 
db2a8b
+GooList *TextSelectionSizer::getRegion () {
db2a8b
+  GooList *recList;
db2a8b
+  int i;
db2a8b
+
db2a8b
+  recList = new GooList();
db2a8b
+
db2a8b
+  for (i = 0; i < list->getLength(); i++) {
db2a8b
+    PDFRectangle *selection_rect = (PDFRectangle *) list->get(i);
db2a8b
+
db2a8b
+    recList->append (new PDFRectangle(selection_rect->x1, selection_rect->y1, selection_rect->x2, selection_rect->y2));
db2a8b
+  }
db2a8b
+
db2a8b
+  return recList;
db2a8b
+}
db2a8b
+
db2a8b
 
db2a8b
 class TextSelectionPainter : public TextSelectionVisitor {
db2a8b
 public:
db2a8b
--- poppler/poppler/XRef.cc
db2a8b
+++ poppler/poppler/XRef.cc
db2a8b
@@ -456,6 +456,7 @@ int XRef::reserve(int newSize)
db2a8b
 
db2a8b
     void *p = greallocn_checkoverflow(entries, realNewSize, sizeof(XRefEntry));
db2a8b
     if (p == nullptr) {
db2a8b
+      entries = nullptr;
db2a8b
       return 0;
db2a8b
     }
db2a8b
 
db2a8b
@@ -877,7 +878,6 @@ GBool XRef::constructXRef(GBool *wasReco
db2a8b
   int offset = 0;
db2a8b
 
db2a8b
   resize(0); // free entries properly
db2a8b
-  gfree(entries);
db2a8b
   capacity = 0;
db2a8b
   size = 0;
db2a8b
   entries = nullptr;
db2a8b
--- poppler/qt5/src/ArthurOutputDev.cc
db2a8b
+++ poppler/qt5/src/ArthurOutputDev.cc
db2a8b
@@ -703,7 +703,11 @@ void ArthurOutputDev::updateFont(GfxStat
db2a8b
 	else
db2a8b
 	  ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
db2a8b
 	if (! ff)
db2a8b
+	{
db2a8b
+	  if (fontsrc && fontsrc->isFile)
db2a8b
+	    fontsrc->unref();
db2a8b
 	  goto err2;
db2a8b
+	}
db2a8b
 	codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
db2a8b
 	delete ff;
db2a8b
       }
db2a8b
@@ -719,6 +723,8 @@ void ArthurOutputDev::updateFont(GfxStat
db2a8b
       break;
db2a8b
     default:
db2a8b
       // this shouldn't happen
db2a8b
+      if (fontsrc && fontsrc->isFile)
db2a8b
+        fontsrc->unref();
db2a8b
       goto err2;
db2a8b
     }
db2a8b
   }
db2a8b
@@ -738,6 +744,8 @@ void ArthurOutputDev::updateFont(GfxStat
db2a8b
   return;
db2a8b
 
db2a8b
  err2:
db2a8b
+  if (fontsrc && !fontsrc->isFile)
db2a8b
+      fontsrc->unref();
db2a8b
   delete id;
db2a8b
 #endif
db2a8b
 }
db2a8b
--- poppler/qt5/src/poppler-page.cc
db2a8b
+++ poppler/qt5/src/poppler-page.cc
db2a8b
@@ -782,6 +782,7 @@ QList<TextBox*> Page::textList(Rotation
db2a8b
   
db2a8b
   if (!word_list || (shouldAbortExtractionCallback && shouldAbortExtractionCallback(closure))) {
db2a8b
     delete output_dev;
db2a8b
+    delete word_list;
db2a8b
     return output_list;
db2a8b
   }
db2a8b
   
db2a8b
--- poppler/test/pdf-inspector.cc
db2a8b
+++ poppler/test/pdf-inspector.cc
db2a8b
@@ -46,6 +46,7 @@ class PdfInspector {
db2a8b
 public:
db2a8b
 
db2a8b
   PdfInspector(void);
db2a8b
+  ~PdfInspector(void);
db2a8b
 
db2a8b
   void set_file_name (const char *file_name);
db2a8b
   void load (const char *file_name);
db2a8b
@@ -136,6 +137,11 @@ PdfInspector::PdfInspector(void)
db2a8b
   // set up initial widgets
db2a8b
   load (nullptr);
db2a8b
 }
db2a8b
+
db2a8b
+PdfInspector::~PdfInspector(void)
db2a8b
+{
db2a8b
+  delete output;
db2a8b
+}
db2a8b
     
db2a8b
 void
db2a8b
 PdfInspector::set_file_name(const char *file_name)
db2a8b
--- poppler/test/perf-test.cc
db2a8b
+++ poppler/test/perf-test.cc
db2a8b
@@ -1053,6 +1053,7 @@ static void ParseCommandLine(int argc, c
db2a8b
                 ++i;
db2a8b
                 if (i == argc)
db2a8b
                     PrintUsageAndExit(argc, argv);
db2a8b
+                free(gOutFileName);
db2a8b
                 gOutFileName = str_dup(argv[i]);
db2a8b
             } else if (str_ieq(arg, PREVIEW_ARG)) {
db2a8b
                 gfPreview = true;
db2a8b
--- poppler/utils/HtmlOutputDev.cc
db2a8b
+++ poppler/utils/HtmlOutputDev.cc
db2a8b
@@ -920,10 +920,11 @@ void HtmlPage::dumpComplex(FILE *file, i
db2a8b
 
db2a8b
   fputs("\n", pageFile);
db2a8b
   
db2a8b
-  if( !noframes )
db2a8b
-  {
db2a8b
+  if( !noframes ){
db2a8b
       fputs("</body>\n</html>\n",pageFile);
db2a8b
       fclose(pageFile);
db2a8b
+  } else if (pageFile != nullptr && pageFile != file){
db2a8b
+      fclose(pageFile);
db2a8b
   }
db2a8b
 }
db2a8b
 
db2a8b
@@ -1376,6 +1377,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
db2a8b
   // TODO can we calculate the resolution of the image?
db2a8b
   if (!writer->init(f1, width, height, 72, 72)) {
db2a8b
     error(errInternal, -1, "Can't init PNG for image '{0:t}'", fName);
db2a8b
+    delete fName;
db2a8b
     delete writer;
db2a8b
     fclose(f1);
db2a8b
     return;
db2a8b
@@ -1417,6 +1419,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
db2a8b
 
db2a8b
       if (!writer->writeRow(row_pointer)) {
db2a8b
         error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
db2a8b
+        delete fName;
db2a8b
         delete writer;
db2a8b
         delete imgStr;
db2a8b
         fclose(f1);
db2a8b
@@ -1455,6 +1458,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
db2a8b
       if (!writer->writeRow( &png_row ))
db2a8b
       {
db2a8b
         error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
db2a8b
+        delete fName;
db2a8b
         delete writer;
db2a8b
         fclose(f1);
db2a8b
         gfree(png_row);
db2a8b
@@ -1472,6 +1476,8 @@ void HtmlOutputDev::drawPngImage(GfxStat
db2a8b
   fclose(f1);
db2a8b
 
db2a8b
   pages->addImage(fName, state);
db2a8b
+
db2a8b
+  delete fName;
db2a8b
 #else
db2a8b
   return;
db2a8b
 #endif
db2a8b
@@ -1617,6 +1623,7 @@ GooString* HtmlOutputDev::getLinkDest(An
db2a8b
 	  }
db2a8b
 	  else 
db2a8b
 	  {
db2a8b
+	      delete file;
db2a8b
 	      return new GooString();
db2a8b
 	  }
db2a8b
 	  }
db2a8b
--- poppler/utils/pdftotext.cc
db2a8b
+++ poppler/utils/pdftotext.cc
db2a8b
@@ -356,6 +356,7 @@ int main(int argc, char *argv[]) {
db2a8b
       fputs("
\n", f);
db2a8b
       if (f != stdout) {
db2a8b
 	fclose(f);
db2a8b
+	f = nullptr;
db2a8b
       }
db2a8b
     }
db2a8b
   }
db2a8b
@@ -372,8 +373,9 @@ int main(int argc, char *argv[]) {
db2a8b
         printWordBBox(f, doc, textOut, firstPage, lastPage);
db2a8b
       }
db2a8b
     }
db2a8b
-    if (f != stdout) {
db2a8b
+    if (f != stdout && f != nullptr) {
db2a8b
       fclose(f);
db2a8b
+      f = nullptr;
db2a8b
     }
db2a8b
   } else {
db2a8b
     textOut = new TextOutputDev(textFileName->getCString(),
db2a8b
@@ -413,7 +415,7 @@ int main(int argc, char *argv[]) {
db2a8b
     if (!bbox) fputs("\n", f);
db2a8b
     fputs("</body>\n", f);
db2a8b
     fputs("</html>\n", f);
db2a8b
-    if (f != stdout) {
db2a8b
+    if (f != stdout && f != nullptr) {
db2a8b
       fclose(f);
db2a8b
     }
db2a8b
   }