<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13347] trunk/wp-includes/meta.php: Validate $object_id in *_metadata()
functions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13347">13347</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-23 22:42:54 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Validate $object_id in *_metadata() functions. Props scribu fixes <a href="http://trac.wordpress.org/ticket/11841">#11841</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (13346 => 13347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-02-23 22:35:07 UTC (rev 13346)
+++ trunk/wp-includes/meta.php 2010-02-23 22:42:54 UTC (rev 13347)
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> if ( !$meta_type || !$meta_key )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( !$object_id = absint($object_id) )
+ return false;
+
</ins><span class="cx"> if ( ! $table = _get_meta_table($meta_type) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -85,6 +88,9 @@
</span><span class="cx"> if ( !$meta_type || !$meta_key )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( !$object_id = absint($object_id) )
+ return false;
+
</ins><span class="cx"> if ( ! $table = _get_meta_table($meta_type) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -138,9 +144,12 @@
</span><span class="cx"> * @return bool True on successful delete, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) {
</span><del>- if ( !$meta_type || !$meta_key || (!$delete_all && ! (int)$object_id) )
</del><ins>+ if ( !$meta_type || !$meta_key )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( !$object_id = absint($object_id) && !$delete_all )
+ return false;
+
</ins><span class="cx"> if ( ! $table = _get_meta_table($meta_type) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -195,6 +204,9 @@
</span><span class="cx"> if ( !$meta_type )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( !$object_id = absint($object_id) )
+ return false;
+
</ins><span class="cx"> $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
</span><span class="cx">
</span><span class="cx"> if ( !$meta_cache ) {
</span></span></pre>
</div>
</div>
</body>
</html>