Bug 404368 - "xulrunner application.ini --version outputs: "(null)" if copyright field is not defined" [p=arno.@no-log.org (arno.) r=bsmedberg a1.9=schrep]

toolkit/xre/nsAppRunner.cpp

@@ -1195,8 +1195,11 @@ VerifyInstallation(nsIFile* aAppDir)
 static inline void
 DumpVersion()
 {
-  printf("%s %s %s, %s\n", 
-         gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright);
+  printf("%s %s %s", 
+         gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
+  if (gAppData->copyright)
+      printf(", %s", gAppData->copyright);
+  printf("\n");
 }
 
 #ifdef MOZ_ENABLE_XREMOTE