[darwinbuild-changes] [767] branches/PR-7593824/darwinup/Depot.cpp

[source_changes at macosforge.org]

Revision: 767
          http://trac.macosforge.org/projects/darwinbuild/changeset/767
Author:   wsiegrist at apple.com
Date:     2010-03-11 11:35:15 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
Check for nulls, fix crash

Modified Paths:
--------------
    branches/PR-7593824/darwinup/Depot.cpp

Modified: branches/PR-7593824/darwinup/Depot.cpp
===================================================================
--- branches/PR-7593824/darwinup/Depot.cpp	2010-03-11 18:29:57 UTC (rev 766)
+++ branches/PR-7593824/darwinup/Depot.cpp	2010-03-11 19:35:15 UTC (rev 767)
@@ -877,7 +877,10 @@
 	 * base system since the rollback archive we'll use will potentially damage
 	 * the base system.
 	 */
-	if (!force && (strcmp(this->m_build, archive->build()) != 0)) {
+	if (!force && 
+		this->m_build &&
+		archive->build() &&
+		(strcmp(this->m_build, archive->build()) != 0)) {
 		fprintf(stderr, 
 				"-------------------------------------------------------------------------------\n"
 				"The %s root was installed on a different base OS build (%s). The current    \n"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100311/a70e251b/attachment-0001.html>