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

Diff Legend

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