[poppler] poppler/poppler: Annot.cc,1.11,1.12 Form.cc,1.5,1.6

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv30834/poppler

Modified Files:
	Annot.cc Form.cc 
Log Message:
        * poppler/Annot.cc: avoid crashing if the font for the drawing methods
        can not be found
        * poppler/Form.cc: fix memory leak
        * qt4/src/poppler-private.h: fix the UnicodeParsedString function to
        really work and not crash
        * splash/SplashTypes.h: RGB8X mode makes max number of components in
        any SplashColor always be 4


Index: Annot.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Annot.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Annot.cc	13 May 2007 00:53:43 -0000	1.11
+++ Annot.cc	21 May 2007 21:29:10 -0000	1.12
@@ -858,6 +858,9 @@
   } else {
     error(-1, "Missing 'Tf' operator in field's DA string");
   }
+  if (!font) {
+    return;
+  }
 
   // get the border width
   border = borderStyle->getWidth();
@@ -1174,6 +1177,9 @@
   } else {
     error(-1, "Missing 'Tf' operator in field's DA string");
   }
+  if (!font) {
+    return;
+  }
 
   // get the border width
   border = borderStyle->getWidth();

Index: Form.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Form.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Form.cc	7 May 2007 18:41:10 -0000	1.5
+++ Form.cc	21 May 2007 21:29:10 -0000	1.6
@@ -458,6 +458,7 @@
   obj.getDict()->set("Opt", objOpt);
   xref->setModifiedObject(&obj, ref); 
   #endif
+  delete [] tmpCurrentChoice;
 }
 
 FormWidgetChoice::~FormWidgetChoice()