[Razorbacktm-devel] SF.net SVN: razorbacktm:[3345] nuggets/pdfFox/branches/releng-0.4

[<tom...@us...>]

Revision: 3345
          http://razorbacktm.svn.sourceforge.net/razorbacktm/?rev=3345&view=rev
Author:   tomjudge
Date:     2012-01-26 21:46:08 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Merged revisions 3343-3344 via svnmerge from 
https://razorbacktm.svn.sourceforge.net/svnroot/razorbacktm/nuggets/pdfFox/trunk

........
  r3343 | thekappa | 2012-01-26 14:36:00 -0500 (Thu, 26 Jan 2012) | 1 line
  
  Fixed a potential double-free in destroyPDFToken
........
  r3344 | thekappa | 2012-01-26 14:36:53 -0500 (Thu, 26 Jan 2012) | 1 line
  
  Fixed file type that PDF Fox registers for
........

Revision Links:
--------------
    http://razorbacktm.svn.sourceforge.net/razorbacktm/?rev=3343&view=rev
    http://razorbacktm.svn.sourceforge.net/razorbacktm/?rev=3344&view=rev

Modified Paths:
--------------
    nuggets/pdfFox/branches/releng-0.4/src/foxtoken.c
    nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c

Property Changed:
----------------
    nuggets/pdfFox/branches/releng-0.4/


Property changes on: nuggets/pdfFox/branches/releng-0.4
___________________________________________________________________
Modified: svnmerge-integrated
   - /nuggets/pdfFox/trunk:1-3108,3141-3175,3177-3212,3339
   + /nuggets/pdfFox/trunk:1-3108,3141-3175,3177-3212,3339,3343-3344
Modified: svn:mergeinfo
   - /nuggets/pdfFox/trunk:3141,3211-3212,3339
   + /nuggets/pdfFox/trunk:3141,3211-3212,3339,3343-3344

Modified: nuggets/pdfFox/branches/releng-0.4/src/foxtoken.c
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/src/foxtoken.c	2012-01-26 19:36:53 UTC (rev 3344)
+++ nuggets/pdfFox/branches/releng-0.4/src/foxtoken.c	2012-01-26 21:46:08 UTC (rev 3345)
@@ -299,6 +299,8 @@
 }
 
 void destroyPDFToken(PDFToken *token) {
+	if (token == NULL)
+		return;
 	if (token->content)
 		free(token->content);
 	free(token);

Modified: nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c	2012-01-26 19:36:53 UTC (rev 3344)
+++ nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c	2012-01-26 21:46:08 UTC (rev 3345)
@@ -103,7 +103,7 @@
     uuid_t l_uuidList[1];
     uuid_t l_pTempUuid;    
     
-    if (!UUID_Get_UUID(DATA_TYPE_OLE_FILE, UUID_TYPE_DATA_TYPE, l_uuidList[0]))
+    if (!UUID_Get_UUID(DATA_TYPE_PDF_FILE, UUID_TYPE_DATA_TYPE, l_uuidList[0]))
     {
         rzb_log(LOG_ERR, "File Log Nugget: Failed to get OLE_FILE UUID");
         return false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.