Changeset 710

Timestamp:

2005年09月07日 21時48分49秒 (3 years ago)

Author:

fujii

Message:

Crash after selecting "Install from Local Directory is fixed."

* package_meta.cc (ScanDownloadedFiles?): Fix treatment of
iterator.

Files:

• branches/3.00/src/ChangeLog.Meadow (modified) (1 diff)
• branches/3.00/src/package_meta.cc (modified) (2 diffs)

branches/3.00/src/ChangeLog.Meadow

@@ +1 @@
+2005-09-07  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * package_meta.cc (ScanDownloadedFiles): Fix treatment of
+        iterator.
+
-2005-08-26  KOSEKI Yoshinori  <kose@meadowy.org>
-

branches/3.00/src/package_meta.cc

@@ -660 +660 @@
-    {
-      packagemeta & pkg = **n;
+#ifdef MEADOW_NETINSTALL
+      set<packageversion>::iterator i = pkg.versions.begin ();
+      while (i != pkg.versions.end())
+#else
-      for (set<packageversion>::iterator i = pkg.versions.begin (); 
-    i != pkg.versions.end (); ++i)
+#endif
-  {
-       /* scan doesn't alter operator == for packageversions */
@@ -680 +685 @@
-         if (pkg.exp == *i)
-       pkg.exp = packageversion();
+#ifdef MEADOW_NETINSTALL
+         /* bug fix: erase() invalidates i. */
+         pkg.versions.erase(i++);
+#else
-          pkg.versions.erase(i);
+#endif
-         /* For now, leave the source version alone */
-        }
+#ifdef MEADOW_NETINSTALL
+    else
+      {
+        ++i;
+      }
+#endif
-  }
-    }