merged from lp:~donkult/apt/sid

diff --cc apt-pkg/deb/deblistparser.cc
index 651fa2a8143e637c7356cd60ed132a4374d3f2d8,fd5a1e47578bd2c53389abe06b6dc7448d4e7a5a..73628c741debd972ad0efd9b6e210638a8c7632f
--- 1/apt-pkg/deb/deblistparser.cc
--- 2/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@@ -784,7 -784,7 +784,9 @@@ bool debListParser::LoadReleaseInfo(pkg
        size_t len = 0;
  
        // Skip empty lines
--      for (; buffer[len] == '\r' && buffer[len] == '\n'; ++len);
++      for (; buffer[len] == '\r' && buffer[len] == '\n'; ++len)
++         /* nothing */
++         ;
        if (buffer[len] == '\0')
         continue;
  
@@@ -798,13 -798,17 +800,25 @@@
        }
  
        // seperate the tag from the data
--      for (; buffer[len] != ':' && buffer[len] != '\0'; ++len);
++      for (; buffer[len] != ':' && buffer[len] != '\0'; ++len)
++         /* nothing */
++         ;
        if (buffer[len] == '\0')
         continue;
        char* dataStart = buffer + len;
--      for (++dataStart; *dataStart == ' '; ++dataStart);
++      for (++dataStart; *dataStart == ' '; ++dataStart)
++         /* nothing */
++         ;
        char* dataEnd = dataStart;
--      for (++dataEnd; *dataEnd != '\0'; ++dataEnd);
++      for (++dataEnd; *dataEnd != '\0'; ++dataEnd)
++         /* nothing */
++         ;
+       // The last char should be a newline, but we can never be sure: #633350
+       char* lineEnd = dataEnd;
 -      for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd);
++      for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd)
++         /* nothing */
++         ;
+       ++lineEnd;
  
        // which datastorage need to be updated
        map_ptrloc* writeTo = NULL;