HeaderImage block displays Unpublished nodes

I just noticed today that some of my unpublished header image nodes were being displayed in my headerimage block. For some odd reason, the image displays fine (i.e. no "access denied" message), however the image has a pink background behind it.

Considering that there isn't any other built-in method right now of temporarily hiding/disabling a headerimage node from the block, it would be great to exclude unpublished nodes from the image selection. This also seems like a very intuitive method for admins to remove nodes from the image selection -- though I could think of cases where a site admin wouldn't want to actually unpublish a node, but simply hide it from the headerimage selection, and so a better solution could be thought of in the future. But either way, the semantic definition of any "unpublished node" is that it should not be available for public viewing.

The simplest method to exclude unpublished nodes (without doing a bunch of modifications to the existing code) is to alter the image selection query.
Line 180 in the function headerimage_select_node():

Change this line:
$result = db_query("SELECT nid, conditions FROM {headerimage} WHERE block = %d ORDER BY weight, nid ASC", $block);

To this:
$result = db_query("SELECT nid, conditions FROM {headerimage} LEFT JOIN {node} USING(nid) WHERE block = %d AND status = 1 ORDER BY weight, nid ASC", $block);

--

Here's a workaround method until this fix gets committed:
Create a separate header image block called something like "Header Images Disabled" and move the unpublished nodes into that block.