ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Compress-LZF/LZF.xs
(Generate patch)

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.19 by pcg, Tue Aug 3 15:07:51 2004 UTC vs.
Revision 1.22 by root, Wed Sep 27 19:01:48 2006 UTC

… …
25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
26#define MAGIC_R 4 /* storable (reference, freeze) */ 26#define MAGIC_R 4 /* storable (reference, freeze) */
27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#define MAGIC_HI 7 /* room for one higher storable major */ 29#define MAGIC_HI 7 /* room for one higher storable major */
30/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
30 31
31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 32#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
32 33
33static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
34static CV *storable_mstore, *storable_mretrieve; 35static CV *storable_mstore, *storable_mretrieve;
36
37#if Size_t_size > 4
38# define MAX_LENGTH ((Size_t)0x80000000L)
39#else
40# define MAX_LENGTH ((Size_t) 0x8000000L)
41#endif
35 42
36static SV * 43static SV *
37compress_sv (SV *data, char cprepend, int uprepend) 44compress_sv (SV *data, char cprepend, int uprepend)
38{ 45{
39 STRLEN usize, csize; 46 STRLEN usize, csize;
… …
49 dst = (unsigned char *)SvPVX (ret); 56 dst = (unsigned char *)SvPVX (ret);
50 57
51 if (cprepend) 58 if (cprepend)
52 dst[skip++] = cprepend; 59 dst[skip++] = cprepend;
53 60
54 if (usize < 0x80) 61 if (usize <= 0x7f)
55 { 62 {
56 dst[skip++] = usize; 63 dst[skip++] = usize;
57 } 64 }
58 else if (usize < 0x800) 65 else if (usize <= 0x7ff)
59 { 66 {
60 dst[skip++] = (( usize >> 6) | 0xc0); 67 dst[skip++] = (( usize >> 6) | 0xc0);
61 dst[skip++] = (( usize & 0x3f) | 0x80); 68 dst[skip++] = (( usize & 0x3f) | 0x80);
62 } 69 }
63 else if (usize < 0x10000) 70 else if (usize <= 0xffff)
64 { 71 {
65 dst[skip++] = (( usize >> 12) | 0xe0); 72 dst[skip++] = (( usize >> 12) | 0xe0);
66 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
67 dst[skip++] = (( usize & 0x3f) | 0x80); 74 dst[skip++] = (( usize & 0x3f) | 0x80);
68 } 75 }
69 else if (usize < 0x200000) 76 else if (usize <= 0x1fffff)
70 { 77 {
71 dst[skip++] = (( usize >> 18) | 0xf0); 78 dst[skip++] = (( usize >> 18) | 0xf0);
72 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
74 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
75 } 82 }
76 else if (usize < 0x4000000) 83 else if (usize <= 0x3ffffff)
77 { 84 {
78 dst[skip++] = (( usize >> 24) | 0xf8); 85 dst[skip++] = (( usize >> 24) | 0xf8);
79 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
81 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
82 dst[skip++] = (( usize & 0x3f) | 0x80); 89 dst[skip++] = (( usize & 0x3f) | 0x80);
83 } 90 }
91 else if (usize <= 0x7fffffff)
92 {
93 dst[skip++] = (( usize >> 30) | 0xfc);
94 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
95 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
96 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
97 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
98 dst[skip++] = (( usize & 0x3f) | 0x80);
99 }
84 else 100 else
85 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
86 102
87 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
88 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
89 lzf_compress (src, usize, 105 lzf_compress (src, usize,
90 dst + skip, 106 dst + skip,
… …
127 143
128 csize -= skip; 144 csize -= skip;
129 145
130 if (src[0]) 146 if (src[0])
131 { 147 {
132 if (!(src[0] & 0x80)) 148 if (!(src[0] & 0x80) && csize >= 1)
133 { 149 {
134 csize -= 1; 150 csize -= 1;
135 usize = *src++ & 0xff; 151 usize = *src++ & 0xff;
136 } 152 }
137 else if (!(src[0] & 0x20)) 153 else if (!(src[0] & 0x20) && csize >= 2)
138 { 154 {
139 csize -= 2; 155 csize -= 2;
140 usize = *src++ & 0x1f; 156 usize = *src++ & 0x1f;
141 usize = (usize << 6) | (*src++ & 0x3f); 157 usize = (usize << 6) | (*src++ & 0x3f);
142 } 158 }
143 else if (!(src[0] & 0x10)) 159 else if (!(src[0] & 0x10) && csize >= 3)
144 { 160 {
145 csize -= 3; 161 csize -= 3;
146 usize = *src++ & 0x0f; 162 usize = *src++ & 0x0f;
147 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
148 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
149 } 165 }
150 else if (!(src[0] & 0x08)) 166 else if (!(src[0] & 0x08) && csize >= 4)
151 { 167 {
152 csize -= 4; 168 csize -= 4;
153 usize = *src++ & 0x07; 169 usize = *src++ & 0x07;
154 usize = (usize << 6) | (*src++ & 0x3f); 170 usize = (usize << 6) | (*src++ & 0x3f);
155 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
156 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
157 } 173 }
158 else if (!(src[0] & 0x04)) 174 else if (!(src[0] & 0x04) && csize >= 5)
159 { 175 {
160 csize -= 5; 176 csize -= 5;
161 usize = *src++ & 0x03; 177 usize = *src++ & 0x03;
162 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
165 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
166 } 182 }
183 else if (!(src[0] & 0x02) && csize >= 6)
184 {
185 csize -= 6;
186 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f);
189 usize = (usize << 6) | (*src++ & 0x3f);
190 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f);
192 }
167 else 193 else
194 croak ("compressed data corrupted (invalid length)");
195
196 if (!usize)
168 croak ("compressed data corrupted (invalid length)"); 197 croak ("compressed data corrupted (invalid length)");
169 198
170 ret = NEWSV (0, usize); 199 ret = NEWSV (0, usize);
171 SvPOK_only (ret); 200 SvPOK_only (ret);
172 dst = SvPVX (ret); 201 dst = SvPVX (ret);
173 202
174 if (lzf_decompress (src, csize, dst, usize) != usize) 203 if (lzf_decompress (src, csize, dst, usize) != usize)
204 {
205 SvREFCNT_dec (ret);
175 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 206 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
207 }
176 } 208 }
177 else 209 else
178 { 210 {
179 usize = csize - 1; 211 usize = csize - 1;
180 ret = NEWSV (0, usize); 212 ret = NEWSV (0, usize | 1);
181 SvPOK_only (ret); 213 SvPOK_only (ret);
182 214
183 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 215 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
184 } 216 }
185 217
… …
208 240
209MODULE = Compress::LZF PACKAGE = Compress::LZF 241MODULE = Compress::LZF PACKAGE = Compress::LZF
210 242
211BOOT: 243BOOT:
212 serializer_package = newSVpv ("Storable", 0); 244 serializer_package = newSVpv ("Storable", 0);
213 serializer_mstore = newSVpv ("Storable::mstore", 0); 245 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
214 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 246 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
215 247
216void 248void
217set_serializer(package, mstore, mretrieve) 249set_serializer(package, mstore, mretrieve)
218 SV * package 250 SV * package
… …
278 310
279 SPAGAIN; 311 SPAGAIN;
280 312
281 sv = POPs; 313 sv = POPs;
282 314
283 if (SvPVX (sv)[0] != MAGIC_R) 315 if (SvPVX (sv)[0] == MAGIC_R)
284 croak ("Storable format changed, need newer version of Compress::LZF"); 316 {
285
286 if (deref) 317 if (deref)
287 SvPVX (sv)[0] = MAGIC_R_deref; 318 SvPVX (sv)[0] = MAGIC_R_deref;
319 }
320 else
321 {
322 char pfx[2];
323
324 pfx[0] = MAGIC_undef;
325 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
326
327 sv_insert (sv, 0, 0, pfx, 2);
328 }
288 329
289 if (ix) /* compress */ 330 if (ix) /* compress */
290 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 331 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
291 332
292 XPUSHs (sv); 333 XPUSHs (sv);
… …
307void 348void
308sthaw(sv) 349sthaw(sv)
309 SV * sv 350 SV * sv
310 PROTOTYPE: $ 351 PROTOTYPE: $
311 PPCODE: 352 PPCODE:
312 353{
354 STRLEN svlen;
313 int deref = 0; 355 int deref = 0;
314 356
315 SvGETMAGIC (sv); 357 SvGETMAGIC (sv);
316 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 358 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
317 { 359 {
360 redo:
361
318 switch (SvPVX (sv)[0]) 362 switch (SvPVX (sv)[0])
319 { 363 {
320 case MAGIC_undef: 364 case MAGIC_undef:
365 if (svlen <= 1)
321 XPUSHs (sv_2mortal (NEWSV (0, 0))); 366 XPUSHs (sv_2mortal (NEWSV (0, 0)));
367 else
368 {
369 if (SvPVX (sv)[1] == MAGIC_R_deref)
370 deref = 1;
371 else if (SvPVX (sv)[1] != MAGIC_R)
372 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
373
374 sv_chop (sv, SvPVX (sv) + 2);
375
376 if (!storable_mstore)
377 need_storable ();
378
379 PUSHMARK (SP);
380 XPUSHs (sv);
381 PUTBACK;
382
383 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
384 croak ("Storable::mstore didn't return a single scalar");
385
386 SPAGAIN;
387
388 if (deref)
389 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
390 else
391 SETs (sv_2mortal (newSVsv (TOPs)));
392 }
322 break; 393 break;
323 394
324 case MAGIC_U: 395 case MAGIC_U:
325 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 396 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
326 break; 397 break;
… …
339 case MAGIC_CR: 410 case MAGIC_CR:
340 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 411 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
341 if (deref) 412 if (deref)
342 if (SvPVX (sv)[0] == MAGIC_R_deref) 413 if (SvPVX (sv)[0] == MAGIC_R_deref)
343 SvPVX (sv)[0] = MAGIC_R; 414 SvPVX (sv)[0] = MAGIC_R;
344 else 415
345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 416 goto redo;
346 417
347 case MAGIC_R: 418 case MAGIC_R:
348 handle_MAGIC_R: 419 handle_MAGIC_R:
349 if (!storable_mstore) 420 if (!storable_mstore)
350 need_storable (); 421 need_storable ();
… …
374 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 445 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
375 } 446 }
376 } 447 }
377 else 448 else
378 XPUSHs (sv_2mortal (newSVsv (sv))); 449 XPUSHs (sv_2mortal (newSVsv (sv)));
450}
379 451

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines