From: Sven Over <over@fb.com>
Date: Wed, 27 Apr 2016 13:46:08 +0000 (-0700)
Subject: fix access-after-free bug in ProducerConsumerQueueTest
X-Git-Tag: 2016.07.26~317
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1cf1856408598d785cee4f9439c7671ce458891e;p=folly.git

fix access-after-free bug in ProducerConsumerQueueTest

Summary: This bug causes failure when the test is run under ASAN.

Reviewed By: meyering

Differential Revision: D3229494

fb-gh-sync-id: a43c8332cc45f7892ac86cd0abb799616bca7779
fbshipit-source-id: a43c8332cc45f7892ac86cd0abb799616bca7779
---

diff --git a/folly/test/ProducerConsumerQueueTest.cpp b/folly/test/ProducerConsumerQueueTest.cpp
index 903fe91b..d358035a 100644
--- a/folly/test/ProducerConsumerQueueTest.cpp
+++ b/folly/test/ProducerConsumerQueueTest.cpp
@@ -160,11 +160,11 @@ struct CorrectnessTest {
         } else {
           goto again;
         }
+        EXPECT_EQ(*data, expect);
       } else {
+        EXPECT_EQ(*data, expect);
         queue_.popFront();
       }
-
-      EXPECT_EQ(*data, expect);
     }
   }