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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines