diff --git a/mozilla/tools/dreftool/tokens.cpp b/mozilla/tools/dreftool/tokens.cpp
index 8630d6a3080..641f1ef05b9 100644
--- a/mozilla/tools/dreftool/tokens.cpp
+++ b/mozilla/tools/dreftool/tokens.cpp
@@ -137,8 +137,10 @@ int CCommentToken::consume(char aChar, CScanner& aScanner) {
   else {
     bool done=false;
     nsCAutoString temp("/");
-    while((0==result) && (false==done)){
-      aScanner.readUntil(mTextValue,temp,true);
+    while(!done){
+      result = aScanner.readUntil(mTextValue,temp,true);
+      if (kNoError!=result)
+        break;
       char theChar=mTextValue[mTextValue.Length()-2];
       done=('*'==theChar);
     }