[darwinbuild-changes] [711] branches/PR-7489777/darwinup/Database.cpp

[source_changes at macosforge.org]

Revision: 711
          http://trac.macosforge.org/projects/darwinbuild/changeset/711
Author:   wsiegrist at apple.com
Date:     2010-02-19 16:44:59 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
Fix null check in store_column

Modified Paths:
--------------
    branches/PR-7489777/darwinup/Database.cpp

Modified: branches/PR-7489777/darwinup/Database.cpp
===================================================================
--- branches/PR-7489777/darwinup/Database.cpp	2010-02-20 00:00:19 UTC (rev 710)
+++ branches/PR-7489777/darwinup/Database.cpp	2010-02-20 00:44:59 UTC (rev 711)
@@ -374,10 +374,14 @@
 			IF_DEBUG("blob(%p) size=%d \n", blob, blobsize);
 			*(void**)output = malloc(blobsize);
 			IF_DEBUG("[ALLOC] blob %p \n", *(void**)output);
-			if (*output && blobsize) memcpy(*(void**)output, blob, blobsize);
+			if (*(void**)output && blobsize) {
+				memcpy(*(void**)output, blob, blobsize);
+			} else {
+				fprintf(stderr, "Error: unable to get blob from database stmt.\n");
+			}
 			used = sizeof(void*);
 			IF_DEBUG("store_column used=%u output(%p) = %s \n", 
-					 (uint32_t)used, output, *(char**)output);
+					 (uint32_t)used, *(char**)output, *(char**)output);
 			break;
 		default:
 			fprintf(stderr, "Error: unhandled column type in Database::store_column(): %d \n", 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100219/23d40a05/attachment-0001.html>