Browse Source

Merge pull request #99 from sparksp/aeae2c8476523f1551825afcc17323c4b88d22c5

Secure extracts
Taylor Otwell 13 years ago
parent
commit
2c2dcdc502
2 changed files with 2 additions and 2 deletions
  1. 1 1
      laravel/database/grammars/grammar.php
  2. 1 1
      laravel/session/drivers/cookie.php

+ 1 - 1
laravel/database/grammars/grammar.php

@@ -89,7 +89,7 @@ class Grammar {
 
 
 		foreach ($query->joins as $join)
 		foreach ($query->joins as $join)
 		{
 		{
-			extract($join);
+			extract($join, EXTR_SKIP);
 
 
 			list($column1, $column2) = array($this->wrap($column1), $this->wrap($column2));
 			list($column1, $column2) = array($this->wrap($column1), $this->wrap($column2));
 
 

+ 1 - 1
laravel/session/drivers/cookie.php

@@ -30,7 +30,7 @@ class Cookie implements Driver {
 	 */
 	 */
 	public function save($session, $config, $exists)
 	public function save($session, $config, $exists)
 	{
 	{
-		extract($config);
+		extract($config, EXTR_SKIP);
 
 
 		$payload = Crypter::encrypt(serialize($session));
 		$payload = Crypter::encrypt(serialize($session));