From 4114a4afecdf1753b1140059d71bb03b4cec3ef1 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 18 Oct 2001 18:49:37 +0000 Subject: Fix the frozen bytecode for __hello__ (betcha didn't know that existed :-). Add a test that prevents the __hello__ bytecode from going stale unnoticed again. The test also tests the loophole noted in SF bug #404545. This test will fail right now; I'll check in the fix in a minute. --- Python/frozen.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Python/frozen.c') diff --git a/Python/frozen.c b/Python/frozen.c index 21a0b52549..e40d5d94c9 100644 --- a/Python/frozen.c +++ b/Python/frozen.c @@ -7,21 +7,28 @@ define a single frozen module, __hello__. Loading it will print some famous words... */ +/* To regenerate this data after the bytecode or marshal format has changed, + go to ../Tools/freeze/ and freeze the hello.py file; then copy and paste + the appropriate bytes from M___main__.c. */ + static unsigned char M___hello__[] = { 99,0,0,0,0,1,0,0,0,115,15,0,0,0,127,0, 0,127,1,0,100,0,0,71,72,100,1,0,83,40,2,0, 0,0,115,14,0,0,0,72,101,108,108,111,32,119,111,114, 108,100,46,46,46,78,40,0,0,0,0,40,0,0,0,0, - 115,8,0,0,0,104,101,108,108,111,46,112,121,115,1,0, - 0,0,63,1,0,115,0,0,0,0, + 40,0,0,0,0,40,0,0,0,0,115,8,0,0,0,104, + 101,108,108,111,46,112,121,115,1,0,0,0,63,1,0,115, + 0,0,0,0, }; +#define SIZE sizeof(M___hello__) + static struct _frozen _PyImport_FrozenModules[] = { /* Test module */ - {"__hello__", M___hello__, 90}, + {"__hello__", M___hello__, SIZE}, /* Test package (negative size indicates package-ness) */ - {"__phello__", M___hello__, -90}, - {"__phello__.spam", M___hello__, 90}, + {"__phello__", M___hello__, -SIZE}, + {"__phello__.spam", M___hello__, SIZE}, {0, 0, 0} /* sentinel */ }; -- cgit v1.2.1