* Fixes #11197

The 'while' loop was causing a memory leak, replaced with an 'if' to match the correct functionality.

* Removed blank lines.

* Add back while loop and added an extra condition to prevent infinite loop.