svn commit: r1194872 - /subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c

[st...@apache.org]

Author: stefan2
Date: Sat Oct 29 11:15:45 2011
New Revision: 1194872

URL: http://svn.apache.org/viewvc?rev=1194872&view=rev
Log:
On file-handle-cache branch: fix merge artifact in svn_temp_serializer.c.

* subversion/libsvn_subr/svn_temp_serializer.c
  (store_current_end_pointer): revert to /trunk code

Modified:
    subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c

Modified: subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c?rev=1194872&r1=1194871&r2=1194872&view=diff
==============================================================================
--- subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c (original)
+++ subversion/branches/file-handle-cache/subversion/libsvn_subr/svn_temp_serializer.c Sat Oct 29 11:15:45 2011
@@ -183,8 +183,10 @@ store_current_end_pointer(svn_temp_seria
   apr_size_t ptr_offset;
   apr_size_t *target_ptr;
 
-  /* use the serialized pointer as a storage for the offset */
-  apr_size_t *target_string_ptr = (apr_size_t*)(context->buffer->data + offset);
+  /* if *source_pointer is the root struct, there will be no parent structure
+   * to relate it to */
+  if (context->source == NULL)
+    return;
 
   /* position of the serialized pointer relative to the begin of the buffer */
   ptr_offset = (const char *)source_pointer