Re: [perl #18257] Attempt to free unreferenced scalar (in 5 lines)

[p5sagit/p5-mst-13.2.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 2bd681c..82eb423 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -228,6 +228,49 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #  define XS_VERSION_BOOTCHECK
 #endif
 
+/* 
+   The DBM_setFilter & DBM_ckFilter macros are only used by 
+   the *DB*_File modules 
+*/
+
+#define DBM_setFilter(db_type,code)                            \
+       {                                                       \
+           if (db_type)                                        \
+               RETVAL = sv_mortalcopy(db_type) ;               \
+           ST(0) = RETVAL ;                                    \
+           if (db_type && (code == &PL_sv_undef)) {            \
+                SvREFCNT_dec(db_type) ;                                \
+               db_type = NULL ;                                \
+           }                                                   \
+           else if (code) {                                    \
+               if (db_type)                                    \
+                   sv_setsv(db_type, code) ;                   \
+               else                                            \
+                   db_type = newSVsv(code) ;                   \
+           }                                                   \
+       }
+
+#define DBM_ckFilter(arg,type,name)                            \
+       if (db->type) {                                         \
+           if (db->filtering) {                                \
+               croak("recursion detected in %s", name) ;       \
+           }                                                   \
+           ENTER ;                                             \
+           SAVETMPS ;                                          \
+           SAVEINT(db->filtering) ;                            \
+           db->filtering = TRUE ;                              \
+           SAVESPTR(DEFSV) ;                                   \
+           DEFSV = arg ;                                       \
+           SvTEMP_off(arg) ;                                   \
+           PUSHMARK(SP) ;                                      \
+           PUTBACK ;                                           \
+           (void) perl_call_sv(db->type, G_DISCARD);           \
+           SPAGAIN ;                                           \
+           PUTBACK ;                                           \
+           FREETMPS ;                                          \
+           LEAVE ;                                             \
+       }
+
 #if 1          /* for compatibility */
 #  define VTBL_sv              &PL_vtbl_sv
 #  define VTBL_env             &PL_vtbl_env
@@ -339,9 +382,9 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define putenv             PerlEnv_putenv
 #    define getenv             PerlEnv_getenv
 #    define uname              PerlEnv_uname
-#    define stdin              PerlSIO_stdin()
-#    define stdout             PerlSIO_stdout()
-#    define stderr             PerlSIO_stderr()
+#    define stdin              PerlSIO_stdin
+#    define stdout             PerlSIO_stdout
+#    define stderr             PerlSIO_stderr
 #    define fopen              PerlIO_open
 #    define fclose             PerlIO_close
 #    define feof               PerlIO_eof
@@ -360,8 +403,8 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define setbuf             PerlSIO_setbuf
 #    define setvbuf            PerlSIO_setvbuf
 #    define setlinebuf         PerlSIO_setlinebuf
-#    define stdoutf            PerlIO_stdoutf
-#    define vfprintf           PerlIO_vprintf
+#    define stdoutf            PerlSIO_stdoutf
+#    define vfprintf           PerlSIO_vprintf
 #    define ftell              PerlIO_tell
 #    define fseek              PerlIO_seek
 #    define fgetpos            PerlIO_getpos
@@ -421,6 +464,7 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define longjmp            PerlProc_longjmp
 #    define signal             PerlProc_signal
 #    define getpid             PerlProc_getpid
+#    define gettimeofday       PerlProc_gettimeofday
 #    define htonl              PerlSock_htonl
 #    define htons              PerlSock_htons
 #    define ntohl              PerlSock_ntohl
@@ -465,6 +509,20 @@ C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 #    define socket             PerlSock_socket
 #    define socketpair         PerlSock_socketpair
 #      endif   /* NETWARE && USE_STDIO */
+
+#    ifdef USE_SOCKETS_AS_HANDLES
+#      undef fd_set
+#      undef FD_SET
+#      undef FD_CLR
+#      undef FD_ISSET
+#      undef FD_ZERO
+#      define fd_set           Perl_fd_set
+#      define FD_SET(n,p)      PERL_FD_SET(n,p)
+#      define FD_CLR(n,p)      PERL_FD_CLR(n,p)
+#      define FD_ISSET(n,p)    PERL_FD_ISSET(n,p)
+#      define FD_ZERO(p)       PERL_FD_ZERO(p)
+#    endif     /* USE_SOCKETS_AS_HANDLES */
+
 #  endif  /* NO_XSLOCKS */
 #endif  /* PERL_IMPLICIT_SYS && !PERL_CORE */