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

Diff Legend

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