Merge branch 'master' of git.alt:/people/avm/packages/apt

apt.spec

@@ -1,6 +1,6 @@
 Name: apt
 Version: 0.5.15lorg2
-Release: alt20
+Release: alt21
 
 Summary: Debian's Advanced Packaging Tool with RPM support
 Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
@@ -367,6 +367,13 @@ unset RPM_PYTHON
 # Probably %%doc with README.rsync?
 
 %changelog
+* Fri Aug 29 2008 Alexander Myltsev <avm@altlinux.ru> 0.5.15lorg2-alt21
+- fix by led@: change type of Package.ID to int (fixes #16900)
+- fixes by raorn@:
+ - apt-get.cc: protect VerTag (fixes #16311)
+ - apt-get.cc: fix memory corruption (fixes #14929)
+ - fileutl.cc: change semantics of flExtension() (fixes #15909)
+
 * Sun May 11 2008 Alexey Tourbin <at@altlinux.ru> 0.5.15lorg2-alt20
 - genpkglist.cc: RPMTAG_FILEFLAGS should not be copied into header list
 - lorg-cache-limit.patch: increase cache size limit

apt/apt-pkg/contrib/fileutl.cc

@@ -169,14 +169,14 @@ string flNotFile(string File)
    return string(File,0,Res);
 }
 									/*}}}*/
-// flExtension - Return the extension for the file			/*{{{*/
+// flExtension - Return the extension for the file or "" if none	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 string flExtension(string File)
 {
    string::size_type Res = File.rfind('.');
    if (Res == string::npos)
-      return File;
+      return string();
    Res++;
    return string(File,Res,Res - File.length());
 }

apt/apt-pkg/pkgcache.h

@@ -227,7 +227,7 @@ struct pkgCache::Package
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    
-   unsigned short ID;
+   unsigned int ID;
    unsigned long Flags;
 };
 

apt/cmdline/apt-get.cc

@@ -1897,7 +1897,10 @@ bool DoInstall(CommandLine &CmdL)
 		  return _error->Error(_("Couldn't parse name '%s'"),S);
 	    }
 	    *sep = '\0';
-	    VerTag = p;
+	    /* S may be overwritten later, for example, if it contains
+	     * a file name that will be resolved to a package.
+	     * So we point VerTag to the same offset in OrigS. */
+	    VerTag = (p - S) + OrigS;
 	 }
 	 
 	 // CNC:2003-11-21 - Try to handle unknown file items.
@@ -3244,7 +3247,9 @@ int main(int argc,const char *argv[])
 	 if (strstr(*I, "://") != NULL)
 	 {
 	    URLLst.push_back(*I);
-	    *I = strrchr(*I, '/')+1;
+	    const char *N = strdup(strrchr(*I, '/')+1);
+	    free((void *)*I);
+	    *I = N;
 	 }
       }