patch.4.5.20.2

   1 *** rep/rep_method.c.orig       Fri Oct 20 08:34:06 2006
   2 --- rep/rep_method.c    Fri Oct 27 12:09:04 2006
   3 ***************
   4 *** 526,535 ****
   5                  * will allow the client to either perform recovery or
   6                  * simply join in.
   7                  */
   8 !               if (announce)
   9                         (void)__rep_send_message(dbenv,
  10                             DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
  11 !               else
  12                         (void)__rep_send_message(dbenv,
  13                             DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
  14         }
  15 --- 526,537 ----
  16                  * will allow the client to either perform recovery or
  17                  * simply join in.
  18                  */
  19 !               if (announce) {
  20 !                       if ((ret = __dbt_usercopy(dbenv, dbt)) != 0)
  21 !                               goto err;
  22                         (void)__rep_send_message(dbenv,
  23                             DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
  24 !               } else
  25                         (void)__rep_send_message(dbenv,
  26                             DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
  27         }
  28 ***************
  29 *** 553,558 ****
  30 --- 555,561 ----
  31         }
  32         if (pending_event != DB_EVENT_NO_SUCH_EVENT)
  33                 DB_EVENT(dbenv, pending_event, NULL);
  34 +       __dbt_userfree(dbenv, dbt, NULL, NULL);
  35         return (ret);
  36   }
  37
  38 *** rep/rep_record.c.orig       Fri Oct 20 08:34:06 2006
  39 --- rep/rep_record.c    Mon Nov 13 10:46:29 2006
  40 ***************
  41 *** 163,168 ****
  42 --- 163,176 ----
  43                 return (EINVAL);
  44         }
  45
  46 +       if ((ret = __dbt_usercopy(dbenv, control)) != 0 ||
  47 +           (ret = __dbt_usercopy(dbenv, rec)) != 0) {
  48 +               __dbt_userfree(dbenv, control, rec, NULL);
  49 +               __db_errx(dbenv,
  50 +       "DB_ENV->rep_process_message: error retrieving DBT contents");
  51 +               return ret;
  52 +       }
  53 +
  54         ret = 0;
  55         db_rep = dbenv->rep_handle;
  56         rep = db_rep->region;
  57 ***************
  58 *** 621,626 ****
  59 --- 629,635 ----
  60                         *ret_lsnp = rp->lsn;
  61                 ret = DB_REP_NOTPERM;
  62         }
  63 +       __dbt_userfree(dbenv, control, rec, NULL);
  64         return (ret);
  65   }
  66