diff --git a/manifest b/manifest
index 18304a111d..d51c4c2858 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfixes\sand\sadditional\stesting\sof\sdescending\sindices.\s(CVS\s2841)
-D 2005-12-21T18:36:46
+C Make\sgenericAllocationSize\swork\son\sNULL\spointers.\s(CVS\s2842)
+D 2005-12-22T13:47:50
 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -52,7 +52,7 @@ F src/main.c ec04b37605752a4294ae98f2b7d78ba62950ba2f
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 7b4a002d9c9421580276db55d2329636a604e8ef
 F src/os.h e941992043b127fdb1bd114f0b4319ae1c4562a7
-F src/os_common.h a4ad0448f112bb124e5df9eb41c377e770aee7b2
+F src/os_common.h d0b1f2f32926e9b6db7886a7f43008b596a9e926
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 6394d2fa3a8bfbceb227579b44b4b343b5b54a8f
@@ -331,7 +331,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 7064433e5b06a4f858f39ce57650fba99fd72ffd
-R 94917009e8a89e467b492554dcbf3812
+P 5638a11ed5618dd833d3daffc1715951091d72b2
+R 4fcec6e31896f75351a3356ac180d0a7
 U drh
-Z f7950fd75afb0bae2ca1ce1afe7aaa41
+Z 51a8043067554832e2986a9a0acbf2b7
diff --git a/manifest.uuid b/manifest.uuid
index 5df31366a3..918a739cbe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5638a11ed5618dd833d3daffc1715951091d72b2
\ No newline at end of file
+326fc9cc11c86f2d96763537d60757200ce21a84
\ No newline at end of file
diff --git a/src/os_common.h b/src/os_common.h
index 7822be0e2a..cca9f5a979 100644
--- a/src/os_common.h
+++ b/src/os_common.h
@@ -156,6 +156,5 @@ static void genericFree(void *p){
   free((void *)((char *)p - 8));
 }
 static int genericAllocationSize(void *p){
-  return *(int *)((char *)p - 8);
+  return p ? *(int *)((char *)p - 8) : 0;
 }
-