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.18 by pcg, Tue Aug 3 15:04:05 2004 UTC vs.
Revision 1.34 by root, Mon Jun 29 23:51:28 2015 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/* try to be compatible with older perls */ 5#include "perlmulticore.h"
6/* SvPV_nolen() macro first defined in 5.005_55 */
7/* this is slow, not threadsafe, but works */
8#include "patchlevel.h"
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
16 6
17#define HLOG 15 7#define LZF_STANDALONE 1
18#define ULTRA_FAST 0 8#define LZF_STATE_ARG 1
19 9
20#include "lzf_c.c" 10#include "lzf_c.c"
21#include "lzf_d.c" 11#include "lzf_d.c"
12#include "lzf_c_best.c"
22 13
23/* we re-use the storable header for our purposes */ 14/* we re-use the storable header for our purposes */
24#define MAGIC_LO 0 15#define MAGIC_LO 0
25#define MAGIC_U 0 /* uncompressed data follows */ 16#define MAGIC_U 0 /* uncompressed data follows */
26#define MAGIC_C 1 /* compressed data follows */ 17#define MAGIC_C 1 /* compressed data follows */
28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 19#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
29#define MAGIC_R 4 /* storable (reference, freeze) */ 20#define MAGIC_R 4 /* storable (reference, freeze) */
30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 21#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 22#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
32#define MAGIC_HI 7 /* room for one higher storable major */ 23#define MAGIC_HI 7 /* room for one higher storable major */
24/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
33 25
34#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 26#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
35 27
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 28static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
37static CV *storable_mstore, *storable_mretrieve; 29static CV *storable_mstore, *storable_mretrieve;
38 30
31#if Size_t_size > 4
32# define MAX_LENGTH ((Size_t)0x80000000L)
33#else
34# define MAX_LENGTH ((Size_t) 0x8000000L)
35#endif
36
39static SV * 37static SV *
40compress_sv (SV *data, char cprepend, int uprepend) 38compress_sv (SV *data, char cprepend, int uprepend, int best)
41{ 39{
40 void *state;
42 STRLEN usize, csize; 41 STRLEN usize, csize;
43 char *src = (char *)SvPV (data, usize); 42 char *src = (char *)SvPVbyte (data, usize);
44 43
45 if (usize) 44 if (usize)
46 { 45 {
47 SV *ret = NEWSV (0, usize + 1); 46 SV *ret = NEWSV (0, usize + 1);
48 unsigned char *dst; 47 unsigned char *dst;
52 dst = (unsigned char *)SvPVX (ret); 51 dst = (unsigned char *)SvPVX (ret);
53 52
54 if (cprepend) 53 if (cprepend)
55 dst[skip++] = cprepend; 54 dst[skip++] = cprepend;
56 55
57 if (usize < 0x80) 56 if (usize <= 0x7f)
58 { 57 {
59 dst[skip++] = usize; 58 dst[skip++] = usize;
60 } 59 }
61 else if (usize < 0x800) 60 else if (usize <= 0x7ff)
62 { 61 {
63 dst[skip++] = (( usize >> 6) | 0xc0); 62 dst[skip++] = (( usize >> 6) | 0xc0);
64 dst[skip++] = (( usize & 0x3f) | 0x80); 63 dst[skip++] = (( usize & 0x3f) | 0x80);
65 } 64 }
66 else if (usize < 0x10000) 65 else if (usize <= 0xffff)
67 { 66 {
68 dst[skip++] = (( usize >> 12) | 0xe0); 67 dst[skip++] = (( usize >> 12) | 0xe0);
69 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 68 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
70 dst[skip++] = (( usize & 0x3f) | 0x80); 69 dst[skip++] = (( usize & 0x3f) | 0x80);
71 } 70 }
72 else if (usize < 0x200000) 71 else if (usize <= 0x1fffff)
73 { 72 {
74 dst[skip++] = (( usize >> 18) | 0xf0); 73 dst[skip++] = (( usize >> 18) | 0xf0);
75 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 74 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
76 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 75 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
77 dst[skip++] = (( usize & 0x3f) | 0x80); 76 dst[skip++] = (( usize & 0x3f) | 0x80);
78 } 77 }
79 else if (usize < 0x4000000) 78 else if (usize <= 0x3ffffff)
80 { 79 {
81 dst[skip++] = (( usize >> 24) | 0xf8); 80 dst[skip++] = (( usize >> 24) | 0xf8);
82 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 81 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 82 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
85 dst[skip++] = (( usize & 0x3f) | 0x80); 84 dst[skip++] = (( usize & 0x3f) | 0x80);
86 } 85 }
86 else if (usize <= 0x7fffffff)
87 {
88 dst[skip++] = (( usize >> 30) | 0xfc);
89 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
92 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
93 dst[skip++] = (( usize & 0x3f) | 0x80);
94 }
87 else 95 else
88 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 96 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
97
98 if (usize > 2000) perlinterp_release ();
99
100 state = malloc (best ? sizeof (LZF_STATE_BEST) : sizeof (LZF_STATE));
101 if (!state)
102 {
103 if (usize > 2000) perlinterp_acquire ();
104 croak ("Compress::LZF unable to allocate memory for compression state");
105 }
89 106
90 /* 11 bytes is the smallest compressible string */ 107 /* 11 bytes is the smallest compressible string */
91 csize = usize < 11 ? 0 : 108 csize = usize < 11 ? 0 :
92 lzf_compress (src, usize, 109 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip, *(LZF_STATE_BEST *)state)
93 dst + skip, 110 : lzf_compress (src, usize, dst + skip, usize - skip, *(LZF_STATE *)state));
94 usize - skip); 111
112 free (state);
113
114 if (usize > 2000) perlinterp_acquire ();
95 115
96 if (csize) 116 if (csize)
97 { 117 {
98 SvCUR_set (ret, csize + skip); 118 SvCUR_set (ret, csize + skip);
99 } 119 }
119 139
120static SV * 140static SV *
121decompress_sv (SV *data, int skip) 141decompress_sv (SV *data, int skip)
122{ 142{
123 STRLEN usize, csize; 143 STRLEN usize, csize;
124 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 144 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
125 145
126 if (csize) 146 if (csize)
127 { 147 {
128 void *dst; 148 void *dst;
129 SV *ret; 149 SV *ret;
150 int res;
130 151
131 csize -= skip; 152 csize -= skip;
132 153
133 if (src[0]) 154 if (src[0])
134 { 155 {
135 if (!(src[0] & 0x80)) 156 if (!(src[0] & 0x80) && csize >= 1)
136 { 157 {
137 csize -= 1; 158 csize -= 1;
138 usize = *src++ & 0xff; 159 usize = *src++ & 0xff;
139 } 160 }
140 else if (!(src[0] & 0x20)) 161 else if (!(src[0] & 0x20) && csize >= 2)
141 { 162 {
142 csize -= 2; 163 csize -= 2;
143 usize = *src++ & 0x1f; 164 usize = *src++ & 0x1f;
144 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
145 } 166 }
146 else if (!(src[0] & 0x10)) 167 else if (!(src[0] & 0x10) && csize >= 3)
147 { 168 {
148 csize -= 3; 169 csize -= 3;
149 usize = *src++ & 0x0f; 170 usize = *src++ & 0x0f;
150 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
152 } 173 }
153 else if (!(src[0] & 0x08)) 174 else if (!(src[0] & 0x08) && csize >= 4)
154 { 175 {
155 csize -= 4; 176 csize -= 4;
156 usize = *src++ & 0x07; 177 usize = *src++ & 0x07;
157 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
160 } 181 }
161 else if (!(src[0] & 0x04)) 182 else if (!(src[0] & 0x04) && csize >= 5)
162 { 183 {
163 csize -= 5; 184 csize -= 5;
164 usize = *src++ & 0x03; 185 usize = *src++ & 0x03;
165 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
166 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
167 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
168 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
169 } 190 }
191 else if (!(src[0] & 0x02) && csize >= 6)
192 {
193 csize -= 6;
194 usize = *src++ & 0x01;
195 usize = (usize << 6) | (*src++ & 0x3f);
196 usize = (usize << 6) | (*src++ & 0x3f);
197 usize = (usize << 6) | (*src++ & 0x3f);
198 usize = (usize << 6) | (*src++ & 0x3f);
199 usize = (usize << 6) | (*src++ & 0x3f);
200 }
170 else 201 else
171 croak ("compressed data corrupted (invalid length)"); 202 croak ("compressed data corrupted (invalid length)");
172 203
204 if (!usize)
205 croak ("compressed data corrupted (invalid length)");
206
173 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
174 SvPOK_only (ret); 208 SvPOK_only (ret);
175 dst = SvPVX (ret); 209 dst = SvPVX (ret);
176 210
211 if (usize > 4000) perlinterp_release ();
177 if (lzf_decompress (src, csize, dst, usize) != usize) 212 res = lzf_decompress (src, csize, dst, usize) != usize;
213 if (usize > 4000) perlinterp_acquire ();
214
215 if (res)
216 {
217 SvREFCNT_dec (ret);
178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 218 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
219 }
179 } 220 }
180 else 221 else
181 { 222 {
182 usize = csize - 1; 223 usize = csize - 1;
183 ret = NEWSV (0, usize); 224 ret = NEWSV (0, usize | 1);
184 SvPOK_only (ret); 225 SvPOK_only (ret);
185 226
186 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 227 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
187 } 228 }
188 229
193 else 234 else
194 return newSVpvn ("", 0); 235 return newSVpvn ("", 0);
195} 236}
196 237
197static void 238static void
198need_storable(void) 239need_storable (void)
199{ 240{
200#if PATCHLEVEL < 6 241 eval_sv (sv_2mortal (newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
201 char req[8192];
202 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
203 perl_eval_pv (req, 1);
204#else
205 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
206#endif
207 242
208 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 243 storable_mstore = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV)));
209 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 244 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
210} 245}
211 246
212MODULE = Compress::LZF PACKAGE = Compress::LZF 247MODULE = Compress::LZF PACKAGE = Compress::LZF
213 248
214BOOT: 249BOOT:
215 serializer_package = newSVpv ("Storable", 0); 250 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0); 251 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 252 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218 253
219void 254void
220set_serializer(package, mstore, mretrieve) 255set_serializer(package, mstore, mretrieve)
221 SV * package 256 SV * package
224 PROTOTYPE: $$$ 259 PROTOTYPE: $$$
225 PPCODE: 260 PPCODE:
226 SvSetSV (serializer_package , package ); 261 SvSetSV (serializer_package , package );
227 SvSetSV (serializer_mstore , mstore ); 262 SvSetSV (serializer_mstore , mstore );
228 SvSetSV (serializer_mretrieve, mretrieve); 263 SvSetSV (serializer_mretrieve, mretrieve);
229 storable_mstore = 264 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
230 storable_mretrieve = 0; 265 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
231 266
232void 267void
233compress(data) 268compress(data)
234 SV * data 269 SV * data
270 ALIAS:
271 compress_best = 1
235 PROTOTYPE: $ 272 PROTOTYPE: $
236 PPCODE: 273 PPCODE:
237 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 274 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
238 275
239void 276void
240decompress(data) 277decompress(data)
241 SV * data 278 SV * data
242 PROTOTYPE: $ 279 PROTOTYPE: $
245 282
246void 283void
247sfreeze(sv) 284sfreeze(sv)
248 SV * sv 285 SV * sv
249 ALIAS: 286 ALIAS:
287 sfreeze = 0
250 sfreeze_cr = 1 288 sfreeze_cr = 1
251 sfreeze_c = 2 289 sfreeze_c = 2
290 sfreeze_best = 4
291 sfreeze_cr_best = 5
292 sfreeze_c_best = 6
252 PROTOTYPE: $ 293 PROTOTYPE: $
253 PPCODE: 294 PPCODE:
295{
296 int best = ix & 4;
297 ix &= 3;
254 298
255 SvGETMAGIC (sv); 299 SvGETMAGIC (sv);
256 300
257 if (!SvOK (sv)) 301 if (!SvOK (sv))
258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 302 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv) 303 else if (SvROK (sv)
304 || SvUTF8 (sv)
260 || (SvTYPE(sv) != SVt_IV 305 || (SvTYPE(sv) != SVt_IV
261 && SvTYPE(sv) != SVt_NV 306 && SvTYPE(sv) != SVt_NV
262 && SvTYPE(sv) != SVt_PV 307 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV 308 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV 309 && SvTYPE(sv) != SVt_PVNV
265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 310 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
266 { 311 {
267 int deref = !SvROK (sv); 312 int deref = !SvROK (sv);
313 char *pv;
268 314
269 if (!storable_mstore) 315 if (!storable_mstore)
316 {
317 PUTBACK;
270 need_storable (); 318 need_storable ();
319 SPAGAIN;
320 }
271 321
272 if (deref) 322 if (deref)
273 sv = newRV_noinc (sv); 323 sv = newRV_noinc (sv);
274 324
275 PUSHMARK (SP); 325 PUSHMARK (SP);
276 XPUSHs (sv); 326 XPUSHs (sv);
277 PUTBACK; 327 PUTBACK;
278 328
279 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 329 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
280 croak ("Storable::mstore didn't return a single scalar"); 330 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
281 331
282 SPAGAIN; 332 SPAGAIN;
283 333
284 sv = POPs; 334 sv = POPs;
335 pv = SvPV_nolen (sv);
285 336
286 if (SvPVX (sv)[0] != MAGIC_R) 337 if (*pv == MAGIC_R)
287 croak ("Storable format changed, need newer version of Compress::LZF"); 338 {
288
289 if (deref) 339 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref; 340 *pv = MAGIC_R_deref;
341 }
342 else
343 {
344 char pfx[2];
345
346 pfx[0] = MAGIC_undef;
347 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
348
349 sv_insert (sv, 0, 0, pfx, 2);
350 }
291 351
292 if (ix) /* compress */ 352 if (ix) /* compress */
293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 353 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
294 354
295 XPUSHs (sv); 355 XPUSHs (sv);
296 } 356 }
297 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 357 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
298 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 358 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
299 else if (ix == 2) /* compress always */ 359 else if (ix == 2) /* compress always */
300 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 360 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
301 else if (SvNIOK (sv)) /* don't compress */ 361 else if (SvNIOK (sv)) /* don't compress */
302 { 362 {
303 STRLEN len; 363 STRLEN len;
304 char *s = SvPV (sv, len); 364 char *s = SvPV (sv, len);
305 XPUSHs (sv_2mortal (newSVpvn (s, len))); 365 XPUSHs (sv_2mortal (newSVpvn (s, len)));
306 } 366 }
307 else /* don't compress */ 367 else /* don't compress */
308 XPUSHs (sv_2mortal (newSVsv (sv))); 368 XPUSHs (sv_2mortal (newSVsv (sv)));
369}
309 370
310void 371void
311sthaw(sv) 372sthaw(sv)
312 SV * sv 373 SV * sv
313 PROTOTYPE: $ 374 PROTOTYPE: $
314 PPCODE: 375 PPCODE:
315 376{
377 STRLEN svlen;
316 int deref = 0; 378 int deref = 0;
317 379
318 SvGETMAGIC (sv); 380 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 381 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
320 { 382 {
383 redo:
384
321 switch (SvPVX (sv)[0]) 385 switch (SvPVX (sv)[0])
322 { 386 {
323 case MAGIC_undef: 387 case MAGIC_undef:
388 if (svlen <= 1)
324 XPUSHs (sv_2mortal (NEWSV (0, 0))); 389 XPUSHs (sv_2mortal (NEWSV (0, 0)));
390 else
391 {
392 if (SvPVX (sv)[1] == MAGIC_R_deref)
393 deref = 1;
394 else if (SvPVX (sv)[1] != MAGIC_R)
395 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
396
397 sv_chop (sv, SvPVX (sv) + 2);
398
399 if (!storable_mstore)
400 {
401 PUTBACK;
402 need_storable ();
403 SPAGAIN;
404 }
405
406 PUSHMARK (SP);
407 XPUSHs (sv);
408 PUTBACK;
409
410 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
411 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
412
413 SPAGAIN;
414
415 if (deref)
416 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
417 else
418 SETs (sv_2mortal (newSVsv (TOPs)));
419 }
325 break; 420 break;
326 421
327 case MAGIC_U: 422 case MAGIC_U:
328 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 423 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
329 break; 424 break;
342 case MAGIC_CR: 437 case MAGIC_CR:
343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 438 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
344 if (deref) 439 if (deref)
345 if (SvPVX (sv)[0] == MAGIC_R_deref) 440 if (SvPVX (sv)[0] == MAGIC_R_deref)
346 SvPVX (sv)[0] = MAGIC_R; 441 SvPVX (sv)[0] = MAGIC_R;
347 else 442
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 443 goto redo;
349 444
350 case MAGIC_R: 445 case MAGIC_R:
351 handle_MAGIC_R: 446 handle_MAGIC_R:
352 if (!storable_mstore) 447 if (!storable_mstore)
448 {
449 PUTBACK;
353 need_storable (); 450 need_storable ();
451 SPAGAIN;
452 }
354 453
355 PUSHMARK (SP); 454 PUSHMARK (SP);
356 XPUSHs (sv); 455 XPUSHs (sv);
357 PUTBACK; 456 PUTBACK;
358 457
359 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 458 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
360 croak ("Storable::mstore didn't return a single scalar"); 459 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
361 460
362 SPAGAIN; 461 SPAGAIN;
363 462
364 if (deref) 463 if (deref)
365 { 464 {
369 SvPVX (sv)[0] = MAGIC_R_deref; 468 SvPVX (sv)[0] = MAGIC_R_deref;
370 } 469 }
371 else 470 else
372 SETs (sv_2mortal (newSVsv (TOPs))); 471 SETs (sv_2mortal (newSVsv (TOPs)));
373 472
374 break; 473 break;
375 474
376 default: 475 default:
377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 476 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
378 } 477 }
379 } 478 }
380 else 479 else
381 XPUSHs (sv_2mortal (newSVsv (sv))); 480 XPUSHs (sv_2mortal (newSVsv (sv)));
481}
382 482

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines