提交: c5646aff15c45f59aa49514394f771277c6ea63a - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• 修订版: c5646aff15c45f59aa49514394f771277c6ea63a (tree)
• 时间: 2011-01-06 06:26:44
• 作者: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Avoid a potential out-of-range action name look-up.

更改概述

• modified: ChangeLog
• modified: src/pkgdeps.cpp

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Avoid a potential out-of-range action name look-up.
+
+	* src/pkgdeps.cpp: Update copyright notice for new year.
+	(pkgXmlDocument::Schedule): Mask action code with ACTION_MASK, to
+	determine correct action name when diagnosing uninstalled package.
+
 2011-01-03  Keith Marshall  <[e-mail]>
 
 	Make "install" and "remove" notifications symmetric.

--- a/src/pkgdeps.cpp
+++ b/src/pkgdeps.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009, 2010, MinGW Project
+ * Copyright (C) 2009, 2010, 2011, MinGW Project
  *
  *
  * Implementation of the package dependency resolver method, of the
@@ -565,7 +565,7 @@ void pkgXmlDocument::Schedule( unsigned long action, const char* name )
 	     * is an error; diagnose it.
 	     */
 	    dmh_notify( DMH_ERROR, "%s %s: package is not installed\n",
-		action_name( action ), name
+		action_name( action & ACTION_MASK ), name
 	      );
 	}