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

Diff Legend

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