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

Diff Legend

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