2 files changed, 6 insertions, 3 deletions

diff --git a/opentracker.c b/opentracker.c
index a2fe24e..87e8b6f 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -374,6 +374,7 @@ SCRAPE_WORKAROUND:
 LOG_TO_STDERR( "scrp: %d.%d.%d.%d - FULL SCRAPE\n", h->ip[0], h->ip[1], h->ip[2], h->ip[3] );
 
       if( !( reply_size = return_fullscrape_for_tracker( &reply ) ) ) HTTPERROR_500;
+      if( (c = realloc( reply, reply_size ) ) ) reply = c;
       ot_overall_tcp_successfulannounces++;
       return sendmallocdata( s, reply, reply_size );
     }
diff --git a/trackerlogic.c b/trackerlogic.c
index 239efb8..37b3c4d 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -325,9 +325,11 @@ size_t return_fullscrape_for_tracker( char **reply ) {
         peers += peer_list->peers[k].size;
         seeds += peer_list->seed_count[k];
       }
-      *r++='2'; *r++='0'; *r++=':';
-      memmove( r, hash, 20 ); r+=20;
-      r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", seeds, peer_list->downloaded, peers-seeds );
+      if( peers ) {
+        *r++='2'; *r++='0'; *r++=':';
+        memmove( r, hash, 20 ); r+=20;
+        r += sprintf( r, "d8:completei%zde10:downloadedi%zde10:incompletei%zdee", seeds, peer_list->downloaded, peers-seeds );
+      }
     }
   }