Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
bsweeney committed Mar 11, 2014
2 parents fbb288d + 23a6939 commit cf7d8a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 4 additions & 0 deletions dompdf.php
Expand Up @@ -227,6 +227,10 @@ function getoptions() {
}
}

if($file_parts['protocol'] === 'php://') {
throw new DOMPDF_Exception("Permission denied on $file. This script does not allow PHP streams.");
}

$outfile = "dompdf_out.pdf"; # Don't allow them to set the output file
$save_file = false; # Don't save the file

Expand Down
7 changes: 0 additions & 7 deletions include/dompdf.cls.php
Expand Up @@ -580,13 +580,6 @@ function load_html($str, $encoding = null) {
$str = substr($str, 3);
}

// Parse embedded php, first-pass
if ( $this->get_option("enable_php") ) {
ob_start();
eval("?" . ">$str");
$str = ob_get_clean();
}

// if the document contains non utf-8 with a utf-8 meta tag chars and was
// detected as utf-8 by mbstring, problems could happen.
// http://devzone.zend.com/article/8855
Expand Down
2 changes: 1 addition & 1 deletion lib/php-font-lib

0 comments on commit cf7d8a0

Please sign in to comment.