Merge "Fixing memory leak when kafka producer is not present. Closes-…

…Bug:1586189" into R2.22.x
Juniper · Jul 1, 2016 · 786f9d4 · 786f9d4
2 parents c5ca289 + 8af0a45
commit 786f9d4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/analytics/OpServerProxy.cc b/src/analytics/OpServerProxy.cc
@@ -124,16 +124,17 @@ class OpServerProxy::OpServerImpl {
                 LOG(ERROR, "Kafka ignoring KafkaPub");
                 return;
             }
-            char* gn = new char[gen.length()+1];
-            strcpy(gn,gen.c_str());
 
             if (producer_) {
+                char* gn = new char[gen.length()+1];
+                strcpy(gn,gen.c_str());
+
                 // Key in Kafka Topic includes UVE Key, Type
                 producer_->produce(topic_[pt].get(), 0, 
                     RdKafka::Producer::MSG_COPY,
                     const_cast<char *>(value.c_str()), value.length(),
                     &skey, (void *)gn);
-                }
+            }
         }
 
         struct RedisInfo {