[svn:parrot] r15517 - in trunk: . src

[chro...@cvs.perl.org]

Author: chromatic
Date: Mon Nov 13 19:33:17 2006
New Revision: 15517

Modified:
trunk/ (props changed)
trunk/src/packfile.c

Log:
Fix size mismatch errors, at least on Linux/PPC. If this breaks other platforms, there's a deeper bug somewhere and we need to rethink t/tools/pbc_merge.t for the release.

Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c (original)
+++ trunk/src/packfile.c Mon Nov 13 19:33:17 2006
@@ -1712,11 +1712,11 @@
const size_t size = seg->op_count;
opcode_t * const ret = PackFile_Segment_pack(interp, seg, cursor);

- if ((size_t)(ret - cursor) != size) {
+ if (!PackFile_check_segment_size(size, seg->name)) {
internal_exception(1, "directory_pack segment '%s' used size %d "
"but reported %d\n", seg->name, (int)(ret-cursor), (int)size);
}
- cursor = ret;
+ cursor += size;
}

return cursor;