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.32 by root, Sat Jun 27 19:52:44 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 LZF_STATE *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);
82 97
98 New (0, state, 1, LZF_STATE);
99 if (!state)
100 croak ("Compress::LZF unable to allocate memory for compression state");
101
102 if (usize > 1000) perlinterp_release ();
83 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
84 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
85 lzf_compress (src, usize, 105 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip)
86 dst + skip, 106 : lzf_compress (src, usize, dst + skip, usize - skip, *state));
87 usize - skip); 107 if (usize > 1000) perlinterp_acquire ();
108
109 Safefree (state);
88 110
89 if (csize) 111 if (csize)
90 { 112 {
91 SvCUR_set (ret, csize + skip); 113 SvCUR_set (ret, csize + skip);
92 } 114 }
93 else if (!uprepend) 115 else if (uprepend < 0)
94 { 116 {
95 SvREFCNT_dec (ret); 117 SvREFCNT_dec (ret);
96 ret = SvREFCNT_inc (data); 118 ret = SvREFCNT_inc (data);
97 } 119 }
98 else 120 else
99 { 121 {
100 *dst++ = 0; 122 *dst++ = uprepend;
101 123
102 Move ((void *)src, (void *)dst, usize, unsigned char); 124 Move ((void *)src, (void *)dst, usize, unsigned char);
103 125
104 SvCUR_set (ret, usize + 1); 126 SvCUR_set (ret, usize + 1);
105 } 127 }
… …
112 134
113static SV * 135static SV *
114decompress_sv (SV *data, int skip) 136decompress_sv (SV *data, int skip)
115{ 137{
116 STRLEN usize, csize; 138 STRLEN usize, csize;
117 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 139 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
118 140
119 if (csize) 141 if (csize)
120 { 142 {
121 void *dst; 143 void *dst;
122 SV *ret; 144 SV *ret;
145 int res;
123 146
124 csize -= skip; 147 csize -= skip;
125 148
126 if (src[0]) 149 if (src[0])
127 { 150 {
128 if (!(src[0] & 0x80)) 151 if (!(src[0] & 0x80) && csize >= 1)
129 { 152 {
130 csize -= 1; 153 csize -= 1;
131 usize = *src++ & 0xff; 154 usize = *src++ & 0xff;
132 } 155 }
133 else if (!(src[0] & 0x20)) 156 else if (!(src[0] & 0x20) && csize >= 2)
134 { 157 {
135 csize -= 2; 158 csize -= 2;
136 usize = *src++ & 0x1f; 159 usize = *src++ & 0x1f;
137 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
138 } 161 }
139 else if (!(src[0] & 0x10)) 162 else if (!(src[0] & 0x10) && csize >= 3)
140 { 163 {
141 csize -= 3; 164 csize -= 3;
142 usize = *src++ & 0x0f; 165 usize = *src++ & 0x0f;
143 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
144 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
145 } 168 }
146 else if (!(src[0] & 0x08)) 169 else if (!(src[0] & 0x08) && csize >= 4)
147 { 170 {
148 csize -= 4; 171 csize -= 4;
149 usize = *src++ & 0x07; 172 usize = *src++ & 0x07;
150 usize = (usize << 6) | (*src++ & 0x3f); 173 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
152 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
153 } 176 }
154 else if (!(src[0] & 0x04)) 177 else if (!(src[0] & 0x04) && csize >= 5)
155 { 178 {
156 csize -= 5; 179 csize -= 5;
157 usize = *src++ & 0x03; 180 usize = *src++ & 0x03;
158 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 182 usize = (usize << 6) | (*src++ & 0x3f);
160 usize = (usize << 6) | (*src++ & 0x3f); 183 usize = (usize << 6) | (*src++ & 0x3f);
161 usize = (usize << 6) | (*src++ & 0x3f); 184 usize = (usize << 6) | (*src++ & 0x3f);
162 } 185 }
186 else if (!(src[0] & 0x02) && csize >= 6)
187 {
188 csize -= 6;
189 usize = *src++ & 0x01;
190 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f);
192 usize = (usize << 6) | (*src++ & 0x3f);
193 usize = (usize << 6) | (*src++ & 0x3f);
194 usize = (usize << 6) | (*src++ & 0x3f);
195 }
163 else 196 else
164 croak ("compressed data corrupted"); 197 croak ("compressed data corrupted (invalid length)");
165 198
199 if (!usize)
200 croak ("compressed data corrupted (invalid length)");
201
166 ret = NEWSV (0, usize); 202 ret = NEWSV (0, usize);
167 SvPOK_only (ret); 203 SvPOK_only (ret);
168 dst = SvPVX (ret); 204 dst = SvPVX (ret);
169 205
206 if (usize > 2000) perlinterp_release ();
170 if (lzf_decompress (src, csize, dst, usize) != usize) 207 res = lzf_decompress (src, csize, dst, usize) != usize;
208 if (usize > 2000) perlinterp_acquire ();
209
210 if (res)
211 {
212 SvREFCNT_dec (ret);
171 croak ("compressed data corrupted", csize, skip, usize); 213 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
214 }
172 } 215 }
173 else 216 else
174 { 217 {
175 usize = csize - 1; 218 usize = csize - 1;
176 ret = NEWSV (0, usize); 219 ret = NEWSV (0, usize | 1);
177 SvPOK_only (ret); 220 SvPOK_only (ret);
178 221
179 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 222 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
180 } 223 }
181 224
… …
186 else 229 else
187 return newSVpvn ("", 0); 230 return newSVpvn ("", 0);
188} 231}
189 232
190static void 233static void
191need_storable(void) 234need_storable (void)
192{ 235{
193#if PATCHLEVEL < 6 236 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 237
199 storable_mstore = GvCV (gv_fetchpv ("Storable::mstore" , TRUE, SVt_PVCV)); 238 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)); 239 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
201} 240}
202 241
203MODULE = Compress::LZF PACKAGE = Compress::LZF 242MODULE = Compress::LZF PACKAGE = Compress::LZF
243
244BOOT:
245 serializer_package = newSVpv ("Storable", 0);
246 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
247 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
248
249void
250set_serializer(package, mstore, mretrieve)
251 SV * package
252 SV * mstore
253 SV * mretrieve
254 PROTOTYPE: $$$
255 PPCODE:
256 SvSetSV (serializer_package , package );
257 SvSetSV (serializer_mstore , mstore );
258 SvSetSV (serializer_mretrieve, mretrieve);
259 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
260 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
204 261
205void 262void
206compress(data) 263compress(data)
207 SV * data 264 SV * data
265 ALIAS:
266 compress_best = 1
208 PROTOTYPE: $ 267 PROTOTYPE: $
209 PPCODE: 268 PPCODE:
210 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 269 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
211 270
212void 271void
213decompress(data) 272decompress(data)
214 SV * data 273 SV * data
215 PROTOTYPE: $ 274 PROTOTYPE: $
… …
218 277
219void 278void
220sfreeze(sv) 279sfreeze(sv)
221 SV * sv 280 SV * sv
222 ALIAS: 281 ALIAS:
282 sfreeze = 0
223 sfreeze_cr = 1 283 sfreeze_cr = 1
224 sfreeze_c = 2 284 sfreeze_c = 2
285 sfreeze_best = 4
286 sfreeze_cr_best = 5
287 sfreeze_c_best = 6
225 PROTOTYPE: $ 288 PROTOTYPE: $
226 PPCODE: 289 PPCODE:
290{
291 int best = ix & 4;
292 ix &= 3;
227 293
294 SvGETMAGIC (sv);
295
296 if (!SvOK (sv))
297 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
298 else if (SvROK (sv)
299 || SvUTF8 (sv)
228 if (SvTYPE(sv) != SVt_IV 300 || (SvTYPE(sv) != SVt_IV
229 && SvTYPE(sv) != SVt_NV 301 && SvTYPE(sv) != SVt_NV
302 && SvTYPE(sv) != SVt_PV
303 && SvTYPE(sv) != SVt_PVIV
304 && SvTYPE(sv) != SVt_PVNV
230 && SvTYPE(sv) != SVt_PV) /* mstore */ 305 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
231 { 306 {
307 int deref = !SvROK (sv);
308 char *pv;
309
232 if (!storable_mstore) 310 if (!storable_mstore)
311 {
312 PUTBACK;
233 need_storable (); 313 need_storable ();
314 SPAGAIN;
315 }
316
317 if (deref)
318 sv = newRV_noinc (sv);
234 319
235 PUSHMARK (SP); 320 PUSHMARK (SP);
236 XPUSHs (sv); 321 XPUSHs (sv);
237 PUTBACK; 322 PUTBACK;
238 323
239 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 324 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
240 croak ("Storable::mstore didn't return a single scalar"); 325 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
241 326
242 SPAGAIN; 327 SPAGAIN;
243 328
244 sv = POPs; 329 sv = POPs;
330 pv = SvPV_nolen (sv);
245 331
246 if (SvPVX (sv)[0] != MAGIC_R) 332 if (*pv == MAGIC_R)
247 croak ("Storable format changed, need newer version of Compress::LZF"); 333 {
334 if (deref)
335 *pv = MAGIC_R_deref;
336 }
337 else
338 {
339 char pfx[2];
340
341 pfx[0] = MAGIC_undef;
342 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
343
344 sv_insert (sv, 0, 0, pfx, 2);
345 }
248 346
249 if (ix) /* compress */ 347 if (ix) /* compress */
250 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 348 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
251 else 349
252 XPUSHs (sv); 350 XPUSHs (sv);
253 } 351 }
254 else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 352 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 */ 353 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
256 else if (ix == 2) /* compress always */ 354 else if (ix == 2) /* compress always */
257 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 355 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
356 else if (SvNIOK (sv)) /* don't compress */
357 {
358 STRLEN len;
359 char *s = SvPV (sv, len);
360 XPUSHs (sv_2mortal (newSVpvn (s, len)));
361 }
258 else /* don't compress */ 362 else /* don't compress */
259 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 363 XPUSHs (sv_2mortal (newSVsv (sv)));
364}
260 365
261void 366void
262sthaw(sv) 367sthaw(sv)
263 SV * sv 368 SV * sv
264 PROTOTYPE: $ 369 PROTOTYPE: $
265 PPCODE: 370 PPCODE:
266 char hdr = SvPVX (sv)[0]; 371{
372 STRLEN svlen;
373 int deref = 0;
267 374
268 if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI)) 375 SvGETMAGIC (sv);
376 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
269 { 377 {
378 redo:
379
270 switch (SvPVX (sv)[0]) 380 switch (SvPVX (sv)[0])
271 { 381 {
382 case MAGIC_undef:
383 if (svlen <= 1)
384 XPUSHs (sv_2mortal (NEWSV (0, 0)));
385 else
386 {
387 if (SvPVX (sv)[1] == MAGIC_R_deref)
388 deref = 1;
389 else if (SvPVX (sv)[1] != MAGIC_R)
390 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
391
392 sv_chop (sv, SvPVX (sv) + 2);
393
394 if (!storable_mstore)
395 {
396 PUTBACK;
397 need_storable ();
398 SPAGAIN;
399 }
400
401 PUSHMARK (SP);
402 XPUSHs (sv);
403 PUTBACK;
404
405 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
406 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
407
408 SPAGAIN;
409
410 if (deref)
411 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
412 else
413 SETs (sv_2mortal (newSVsv (TOPs)));
414 }
415 break;
416
272 case MAGIC_U: 417 case MAGIC_U:
273 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 418 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
274 break; 419 break;
275 420
276 case MAGIC_C: 421 case MAGIC_C:
277 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 422 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
278 break; 423 break;
279 424
425 case MAGIC_R_deref:
426 deref = 1;
427 SvPVX (sv)[0] = MAGIC_R;
428 goto handle_MAGIC_R;
429
430 case MAGIC_CR_deref:
431 deref = 1;
280 case MAGIC_CR: 432 case MAGIC_CR:
281 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 433 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
434 if (deref)
435 if (SvPVX (sv)[0] == MAGIC_R_deref)
436 SvPVX (sv)[0] = MAGIC_R;
437
438 goto redo;
439
282 case MAGIC_R: 440 case MAGIC_R:
441 handle_MAGIC_R:
283 if (!storable_mstore) 442 if (!storable_mstore)
443 {
444 PUTBACK;
284 need_storable (); 445 need_storable ();
446 SPAGAIN;
447 }
285 448
286 PUSHMARK (SP); 449 PUSHMARK (SP);
287 XPUSHs (sv); 450 XPUSHs (sv);
288 PUTBACK; 451 PUTBACK;
289 452
290 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 453 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
291 croak ("Storable::mstore didn't return a single scalar"); 454 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
292 455
293 SPAGAIN; 456 SPAGAIN;
294 457
295 /*XPUSHs (POPs);*/ 458 if (deref)
459 {
460 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
296 461
462 if (SvPVX (sv)[0] == MAGIC_R)
463 SvPVX (sv)[0] = MAGIC_R_deref;
464 }
465 else
466 SETs (sv_2mortal (newSVsv (TOPs)));
467
297 break; 468 break;
298 469
299 default: 470 default:
300 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 471 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
301 } 472 }
302 } 473 }
303 else 474 else
304 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 475 XPUSHs (sv_2mortal (newSVsv (sv)));
476}
477

Diff Legend

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