Generate does not adhere to cck limits (patch)

I can't believe this bug's been around this long without someone spotting it, but I have exactly this issue, and it seems to be down to the logic in content.devel.inc. If $max is 0 (one value) it works fine, if $max is 1 (unlimited) it works fine, if it's another fixed number however it'll iterate once too many times.

if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
  $max = 0;
}
else {
  switch ($field['multiple']) {
    case 0:
      $max = 0;
      break;
    case 1:
      $max = rand(0, 3); //just an arbitrary number for 'unlimited'
      break;
    default:
      $max = $field['multiple'];
      break;
  }
}
for ($i = 0; $i <= $max; $i++) {

Patch attached. As I say, I'm very confused as to how this could've escaped the gazillions of other developers using this, so I might've missed something :)

Thanks,

Andy

Does D7 need similar fix?

Just gave it a quick go, and it appears that D7's fine. Btw, I realise now that I hijacked/misread this unrelated issue. The OP was on about a field's max length, and I'm referring to the number of fields generated.

Patch isn't committed.