[TWiki-Dev] [SVN] SvenDowideit r16938 - in twiki/trunk/GenPDFAddOn: data/TWiki lib/TWiki/Contrib

[<de...@de...>]

Author: SvenDowideit
Date: 2008-06-25 03:15:40 -0500 (Wed, 25 Jun 2008)
New Revision: 16938
Trac url: http://develop.twiki.org/trac/changeset/16938

Modified:
   twiki/trunk/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt
   twiki/trunk/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
Log:
Item5680: GendPDFAddon? does not use 'TWiki security practice' 

Modified: twiki/trunk/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt
===================================================================
--- twiki/trunk/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt	2008-06-25 08:02:43 UTC (rev 16937)
+++ twiki/trunk/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt	2008-06-25 08:15:40 UTC (rev 16938)
@@ -154,8 +154,9 @@
 ---++ Add-On Info
 
 |  Add-on Author: | TWiki:Main/BrianSpinar, TWiki:Main/WadeTurland |
-|  Add-on Version: | 2 Nov 2007 |
+|  Add-on Version: | 25 Jun 2008 |
 |  Change History: | |
+|  25 Jun 2008 | security and TWiki 4.2 fixes TWiki:Main.SvenDowideit |
 |  2 Nov 2007 | Added new header and footer control (Bugs:Item4916) and fixed generation of wrong TWiki page (Bugs:Item4915) |
 |  23 Oct 2007 | Fixed Bugs:Item4452 & Bugs:Item4885, compatibility with Perl 5.6 and  missing images with SSL certificates |
 |  31 Aug 2007 | Fixed Bugs:Item4530, improper rendering of lists | 

Modified: twiki/trunk/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
===================================================================
--- twiki/trunk/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2008-06-25 08:02:43 UTC (rev 16937)
+++ twiki/trunk/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2008-06-25 08:15:40 UTC (rev 16938)
@@ -14,6 +14,7 @@
 # Copyright (C) 1999 Peter Thoeny, pe...@th...
 # Additional mess by Patrick Ohl - Biomax Bioinformatics AG
 # January 2003
+# fixes for TWiki 4.2 (c) 2008 Sve...@fo...
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -724,18 +725,12 @@
    # Disable CGI feature of newer versions of htmldoc
    # (thanks to Brent Roberts for this fix)
    $ENV{HTMLDOC_NOCGI} = "yes";
-   system($htmldocCmd, @htmldocArgs);
-   if ($? == -1) {
-      die "Failed to start htmldoc ($htmldocCmd): $!\n";
+   my ( $Output, $exit ) =
+     $TWiki::sandbox->sysCommand(
+         $htmldocCmd.' '.join(' ', @htmldocArgs) );
+   if( $exit ) {
+      die "error running htmldoc ($htmldocCmd): $Output\n";
    }
-   elsif ($? & 127) {
-      printf STDERR "child died with signal %d, %s coredump\n",
-         ($? & 127),  ($? & 128) ? 'with' : 'without';
-      die "Conversion failed: '$!'";
-   }
-   else {
-      printf STDERR "child exited with value %d\n", $? >> 8 unless $? >> 8 == 0;
-   }
 
    #  output the HTML header and the output of HTMLDOC
    my $cd = "filename=${webName}_$topic.";