update fixes.

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 6f291cf7a3867d1360dcd89f7401944d9b5483e1..b0cc82e7cf50724fd7d35569ba65049296ee8da8 100644 (file)
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.28 1998/08/19 02:01:41 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.29 1998/08/20 22:24:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -349,8 +349,7 @@ rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 
    ScanDesc = index_beginscan(LocalOldIndex, false, 0, (ScanKey) NULL);
 
-   while ((ScanResult =
-           index_getnext(ScanDesc, ForwardScanDirection)) != NULL)
+   while ((ScanResult = index_getnext(ScanDesc, ForwardScanDirection)) != NULL)
    {
 
        HeapTid = &ScanResult->heap_iptr;

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 28856f518456fae20469612d3cec4f7f179cdc72..113c07cc79ff998ce3441928e38761c5480f1704 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.34 1998/08/19 02:02:38 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.35 1998/08/20 22:24:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -644,11 +644,8 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *buffer)
                                &skey);
        }
 
-       res = NULL;
        do
        {
-           if (res)
-               pfree(res);
            res = index_getnext(obj_desc->iscan, ForwardScanDirection);
 
            if (res == (RetrieveIndexResult) NULL)
@@ -668,7 +665,8 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *buffer)
             */
 
            tuple = heap_fetch(obj_desc->heap_r, SnapshotNow,
-                             &(res->heap_iptr), buffer);
+                             &res->heap_iptr, buffer);
+           pfree(res);
        } while (tuple == (HeapTuple) NULL);
 
        /* remember this tid -- we may need it for later reads/writes */