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

Diff Legend

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