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

Diff Legend

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