diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 17:34:48 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 17:34:48 +0200 |
| commit | 55fb35e87a1ff550cbb3010c5a03064f0a2b10be (patch) | |
| tree | 6ecb92eb145eefbb0c4a6dc6a869d9e21ba10b55 /apt-pkg/contrib/configuration.cc | |
| parent | adbce12126ccc58016af69d541bafad5c8bde631 (diff) | |
| parent | d5752e18bed18c706c93f5c43c61016c72132ede (diff) | |
merged from debian
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index a82311a3f..48a5f0bff 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -521,6 +521,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, F.getline(Buffer,sizeof(Buffer) / 2); Input += Buffer; + delete[] Buffer; } while (F.fail() && !F.eof()); @@ -582,7 +583,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, if (InQuote == true) continue; - if (*I == '/' && I + 1 != End && I[1] == '/') + if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#') { End = I; break; |