Skip to content

Commit 37142be

Browse files
authored
Merge pull request from GHSA-mw2w-2hj2-fg8q
Advisory fix
2 parents 6d8e867 + d687882 commit 37142be

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Version 1.1.29 under development
77
- Bug #4516: PHP 8 compatibility: Allow union types and intersection types in action declarations (wtommyw)
88
- Bug #4523: Fixed translated in Greek class messages in framework requirements view, which they should not be translated (lourdas)
99
- Bug #4534: PHP 8.2 compatibility: Fix deprecated dynamic properties in gii/components/Pear/Text/Diff (mdeweerd, marcovtwout)
10+
- Bug: CVE-2023-47130. Prevent RCE when deserializing untrusted user input (ma4ter222, marcovtwout)
1011
- Enh #4529: Exceptions thrown while loading fixture file rows now contain more details (eduardor2k)
1112
- Enh #4533: Various refactorings applied based on PHAN checks (marcovtwout)
1213

framework/db/schema/CDbCriteria.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,17 @@ public function __wakeup()
197197
foreach($sqlContentFieldNames as $field)
198198
{
199199
if(is_array($this->$field))
200+
{
200201
foreach($this->$field as $k=>$v)
201-
$this->{$field}[$k]=strtr($v,$map);
202-
else
202+
{
203+
if (is_scalar($v))
204+
$this->{$field}[$k]=strtr($v,$map);
205+
}
206+
}
207+
elseif(is_scalar($this->$field))
208+
{
203209
$this->$field=strtr($this->$field,$map);
210+
}
204211
}
205212
}
206213
$this->params=$params;

0 commit comments

Comments
 (0)