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.33 by root, Sun Jun 28 18:18:03 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 LZF_STATE *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);
89 97
98 New (0, state, 1, LZF_STATE);
99 if (!state)
100 croak ("Compress::LZF unable to allocate memory for compression state");
101
102 if (usize > 2000) perlinterp_release ();
90 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
91 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
92 lzf_compress (src, usize, 105 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip)
93 dst + skip, 106 : lzf_compress (src, usize, dst + skip, usize - skip, *state));
94 usize - skip); 107 if (usize > 2000) perlinterp_acquire ();
108
109 Safefree (state);
95 110
96 if (csize) 111 if (csize)
97 { 112 {
98 SvCUR_set (ret, csize + skip); 113 SvCUR_set (ret, csize + skip);
99 } 114 }
119 134
120static SV * 135static SV *
121decompress_sv (SV *data, int skip) 136decompress_sv (SV *data, int skip)
122{ 137{
123 STRLEN usize, csize; 138 STRLEN usize, csize;
124 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 139 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
125 140
126 if (csize) 141 if (csize)
127 { 142 {
128 void *dst; 143 void *dst;
129 SV *ret; 144 SV *ret;
145 int res;
130 146
131 csize -= skip; 147 csize -= skip;
132 148
133 if (src[0]) 149 if (src[0])
134 { 150 {
135 if (!(src[0] & 0x80)) 151 if (!(src[0] & 0x80) && csize >= 1)
136 { 152 {
137 csize -= 1; 153 csize -= 1;
138 usize = *src++ & 0xff; 154 usize = *src++ & 0xff;
139 } 155 }
140 else if (!(src[0] & 0x20)) 156 else if (!(src[0] & 0x20) && csize >= 2)
141 { 157 {
142 csize -= 2; 158 csize -= 2;
143 usize = *src++ & 0x1f; 159 usize = *src++ & 0x1f;
144 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
145 } 161 }
146 else if (!(src[0] & 0x10)) 162 else if (!(src[0] & 0x10) && csize >= 3)
147 { 163 {
148 csize -= 3; 164 csize -= 3;
149 usize = *src++ & 0x0f; 165 usize = *src++ & 0x0f;
150 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
152 } 168 }
153 else if (!(src[0] & 0x08)) 169 else if (!(src[0] & 0x08) && csize >= 4)
154 { 170 {
155 csize -= 4; 171 csize -= 4;
156 usize = *src++ & 0x07; 172 usize = *src++ & 0x07;
157 usize = (usize << 6) | (*src++ & 0x3f); 173 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
160 } 176 }
161 else if (!(src[0] & 0x04)) 177 else if (!(src[0] & 0x04) && csize >= 5)
162 { 178 {
163 csize -= 5; 179 csize -= 5;
164 usize = *src++ & 0x03; 180 usize = *src++ & 0x03;
165 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
166 usize = (usize << 6) | (*src++ & 0x3f); 182 usize = (usize << 6) | (*src++ & 0x3f);
167 usize = (usize << 6) | (*src++ & 0x3f); 183 usize = (usize << 6) | (*src++ & 0x3f);
168 usize = (usize << 6) | (*src++ & 0x3f); 184 usize = (usize << 6) | (*src++ & 0x3f);
169 } 185 }
186 else if (!(src[0] & 0x02) && csize >= 6)
187 {
188 csize -= 6;
189 usize = *src++ & 0x01;
190 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f);
192 usize = (usize << 6) | (*src++ & 0x3f);
193 usize = (usize << 6) | (*src++ & 0x3f);
194 usize = (usize << 6) | (*src++ & 0x3f);
195 }
170 else 196 else
171 croak ("compressed data corrupted (invalid length)"); 197 croak ("compressed data corrupted (invalid length)");
172 198
199 if (!usize)
200 croak ("compressed data corrupted (invalid length)");
201
173 ret = NEWSV (0, usize); 202 ret = NEWSV (0, usize);
174 SvPOK_only (ret); 203 SvPOK_only (ret);
175 dst = SvPVX (ret); 204 dst = SvPVX (ret);
176 205
206 if (usize > 4000) perlinterp_release ();
177 if (lzf_decompress (src, csize, dst, usize) != usize) 207 res = lzf_decompress (src, csize, dst, usize) != usize;
208 if (usize > 4000) perlinterp_acquire ();
209
210 if (res)
211 {
212 SvREFCNT_dec (ret);
178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 213 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
214 }
179 } 215 }
180 else 216 else
181 { 217 {
182 usize = csize - 1; 218 usize = csize - 1;
183 ret = NEWSV (0, usize); 219 ret = NEWSV (0, usize | 1);
184 SvPOK_only (ret); 220 SvPOK_only (ret);
185 221
186 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 222 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
187 } 223 }
188 224
193 else 229 else
194 return newSVpvn ("", 0); 230 return newSVpvn ("", 0);
195} 231}
196 232
197static void 233static void
198need_storable(void) 234need_storable (void)
199{ 235{
200#if PATCHLEVEL < 6 236 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 237
208 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 238 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)); 239 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
210} 240}
211 241
212MODULE = Compress::LZF PACKAGE = Compress::LZF 242MODULE = Compress::LZF PACKAGE = Compress::LZF
213 243
214BOOT: 244BOOT:
215 serializer_package = newSVpv ("Storable", 0); 245 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0); 246 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 247 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218 248
219void 249void
220set_serializer(package, mstore, mretrieve) 250set_serializer(package, mstore, mretrieve)
221 SV * package 251 SV * package
224 PROTOTYPE: $$$ 254 PROTOTYPE: $$$
225 PPCODE: 255 PPCODE:
226 SvSetSV (serializer_package , package ); 256 SvSetSV (serializer_package , package );
227 SvSetSV (serializer_mstore , mstore ); 257 SvSetSV (serializer_mstore , mstore );
228 SvSetSV (serializer_mretrieve, mretrieve); 258 SvSetSV (serializer_mretrieve, mretrieve);
229 storable_mstore = 259 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
230 storable_mretrieve = 0; 260 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
231 261
232void 262void
233compress(data) 263compress(data)
234 SV * data 264 SV * data
265 ALIAS:
266 compress_best = 1
235 PROTOTYPE: $ 267 PROTOTYPE: $
236 PPCODE: 268 PPCODE:
237 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 269 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
238 270
239void 271void
240decompress(data) 272decompress(data)
241 SV * data 273 SV * data
242 PROTOTYPE: $ 274 PROTOTYPE: $
245 277
246void 278void
247sfreeze(sv) 279sfreeze(sv)
248 SV * sv 280 SV * sv
249 ALIAS: 281 ALIAS:
282 sfreeze = 0
250 sfreeze_cr = 1 283 sfreeze_cr = 1
251 sfreeze_c = 2 284 sfreeze_c = 2
285 sfreeze_best = 4
286 sfreeze_cr_best = 5
287 sfreeze_c_best = 6
252 PROTOTYPE: $ 288 PROTOTYPE: $
253 PPCODE: 289 PPCODE:
290{
291 int best = ix & 4;
292 ix &= 3;
254 293
255 SvGETMAGIC (sv); 294 SvGETMAGIC (sv);
256 295
257 if (!SvOK (sv)) 296 if (!SvOK (sv))
258 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 297 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
259 else if (SvROK (sv) 298 else if (SvROK (sv)
299 || SvUTF8 (sv)
260 || (SvTYPE(sv) != SVt_IV 300 || (SvTYPE(sv) != SVt_IV
261 && SvTYPE(sv) != SVt_NV 301 && SvTYPE(sv) != SVt_NV
262 && SvTYPE(sv) != SVt_PV 302 && SvTYPE(sv) != SVt_PV
263 && SvTYPE(sv) != SVt_PVIV 303 && SvTYPE(sv) != SVt_PVIV
264 && SvTYPE(sv) != SVt_PVNV 304 && SvTYPE(sv) != SVt_PVNV
265 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 305 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
266 { 306 {
267 int deref = !SvROK (sv); 307 int deref = !SvROK (sv);
308 char *pv;
268 309
269 if (!storable_mstore) 310 if (!storable_mstore)
311 {
312 PUTBACK;
270 need_storable (); 313 need_storable ();
314 SPAGAIN;
315 }
271 316
272 if (deref) 317 if (deref)
273 sv = newRV_noinc (sv); 318 sv = newRV_noinc (sv);
274 319
275 PUSHMARK (SP); 320 PUSHMARK (SP);
276 XPUSHs (sv); 321 XPUSHs (sv);
277 PUTBACK; 322 PUTBACK;
278 323
279 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 324 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
280 croak ("Storable::mstore didn't return a single scalar"); 325 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
281 326
282 SPAGAIN; 327 SPAGAIN;
283 328
284 sv = POPs; 329 sv = POPs;
330 pv = SvPV_nolen (sv);
285 331
286 if (SvPVX (sv)[0] != MAGIC_R) 332 if (*pv == MAGIC_R)
287 croak ("Storable format changed, need newer version of Compress::LZF"); 333 {
288
289 if (deref) 334 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref; 335 *pv = MAGIC_R_deref;
336 }
337 else
338 {
339 char pfx[2];
340
341 pfx[0] = MAGIC_undef;
342 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
343
344 sv_insert (sv, 0, 0, pfx, 2);
345 }
291 346
292 if (ix) /* compress */ 347 if (ix) /* compress */
293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 348 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
294 349
295 XPUSHs (sv); 350 XPUSHs (sv);
296 } 351 }
297 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 352 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 */ 353 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
299 else if (ix == 2) /* compress always */ 354 else if (ix == 2) /* compress always */
300 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 355 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
301 else if (SvNIOK (sv)) /* don't compress */ 356 else if (SvNIOK (sv)) /* don't compress */
302 { 357 {
303 STRLEN len; 358 STRLEN len;
304 char *s = SvPV (sv, len); 359 char *s = SvPV (sv, len);
305 XPUSHs (sv_2mortal (newSVpvn (s, len))); 360 XPUSHs (sv_2mortal (newSVpvn (s, len)));
306 } 361 }
307 else /* don't compress */ 362 else /* don't compress */
308 XPUSHs (sv_2mortal (newSVsv (sv))); 363 XPUSHs (sv_2mortal (newSVsv (sv)));
364}
309 365
310void 366void
311sthaw(sv) 367sthaw(sv)
312 SV * sv 368 SV * sv
313 PROTOTYPE: $ 369 PROTOTYPE: $
314 PPCODE: 370 PPCODE:
315 371{
372 STRLEN svlen;
316 int deref = 0; 373 int deref = 0;
317 374
318 SvGETMAGIC (sv); 375 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 376 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
320 { 377 {
378 redo:
379
321 switch (SvPVX (sv)[0]) 380 switch (SvPVX (sv)[0])
322 { 381 {
323 case MAGIC_undef: 382 case MAGIC_undef:
383 if (svlen <= 1)
324 XPUSHs (sv_2mortal (NEWSV (0, 0))); 384 XPUSHs (sv_2mortal (NEWSV (0, 0)));
385 else
386 {
387 if (SvPVX (sv)[1] == MAGIC_R_deref)
388 deref = 1;
389 else if (SvPVX (sv)[1] != MAGIC_R)
390 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
391
392 sv_chop (sv, SvPVX (sv) + 2);
393
394 if (!storable_mstore)
395 {
396 PUTBACK;
397 need_storable ();
398 SPAGAIN;
399 }
400
401 PUSHMARK (SP);
402 XPUSHs (sv);
403 PUTBACK;
404
405 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
406 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
407
408 SPAGAIN;
409
410 if (deref)
411 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
412 else
413 SETs (sv_2mortal (newSVsv (TOPs)));
414 }
325 break; 415 break;
326 416
327 case MAGIC_U: 417 case MAGIC_U:
328 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 418 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
329 break; 419 break;
342 case MAGIC_CR: 432 case MAGIC_CR:
343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 433 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
344 if (deref) 434 if (deref)
345 if (SvPVX (sv)[0] == MAGIC_R_deref) 435 if (SvPVX (sv)[0] == MAGIC_R_deref)
346 SvPVX (sv)[0] = MAGIC_R; 436 SvPVX (sv)[0] = MAGIC_R;
347 else 437
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 438 goto redo;
349 439
350 case MAGIC_R: 440 case MAGIC_R:
351 handle_MAGIC_R: 441 handle_MAGIC_R:
352 if (!storable_mstore) 442 if (!storable_mstore)
443 {
444 PUTBACK;
353 need_storable (); 445 need_storable ();
446 SPAGAIN;
447 }
354 448
355 PUSHMARK (SP); 449 PUSHMARK (SP);
356 XPUSHs (sv); 450 XPUSHs (sv);
357 PUTBACK; 451 PUTBACK;
358 452
359 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 453 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
360 croak ("Storable::mstore didn't return a single scalar"); 454 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
361 455
362 SPAGAIN; 456 SPAGAIN;
363 457
364 if (deref) 458 if (deref)
365 { 459 {
369 SvPVX (sv)[0] = MAGIC_R_deref; 463 SvPVX (sv)[0] = MAGIC_R_deref;
370 } 464 }
371 else 465 else
372 SETs (sv_2mortal (newSVsv (TOPs))); 466 SETs (sv_2mortal (newSVsv (TOPs)));
373 467
374 break; 468 break;
375 469
376 default: 470 default:
377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 471 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
378 } 472 }
379 } 473 }
380 else 474 else
381 XPUSHs (sv_2mortal (newSVsv (sv))); 475 XPUSHs (sv_2mortal (newSVsv (sv)));
476}
382 477

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines