Merge lp:~jturmel/gearmand/fix_segfault into lp:gearmand/1.0

[Josh Turmel]

[Brian Aker (brianaker)]

This has merged. Thank you!

[Brian Aker (brianaker)]

BTW this was merged into 1.1.

[Josh Turmel (jturmel)]

Great, thanks!

On Fri, Jun 21, 2013 at 2:08 PM, Brian Aker <email address hidden> wrote:

> BTW this was merged into 1.1.
> --
> https://code.launchpad.net/~jturmel/gearmand/fix_segfault/+merge/166882
> You are the owner of lp:~jturmel/gearmand/fix_segfault.
>

[Brian Aker (brianaker)]

Please feel free to send more patches :)

On Jun 21, 2013, at 12:49 PM, Josh Turmel <email address hidden> wrote:

> Great, thanks!
>
>
> On Fri, Jun 21, 2013 at 2:08 PM, Brian Aker <email address hidden> wrote:
>
>> BTW this was merged into 1.1.
>> --
>> https://code.launchpad.net/~jturmel/gearmand/fix_segfault/+merge/166882
>> You are the owner of lp:~jturmel/gearmand/fix_segfault.
>>
>
> --
> https://code.launchpad.net/~jturmel/gearmand/fix_segfault/+merge/166882
> Your team Gearman-developers is subscribed to branch lp:gearmand/1.0.

Unmerged revisions

802. By Josh Turmel on 2013-05-31

Fix segfault

* Gearmand would segfault if you submitted an epoch job while using Postgres
  as the persistent queue

=== modified file 'libgearman-server/plugins/queue/postgres/queue.cc'
--- libgearman-server/plugins/queue/postgres/queue.cc	2012-12-23 11:50:37 +0000
+++ libgearman-server/plugins/queue/postgres/queue.cc	2013-05-31 19:49:25 +0000
@@ -45,6 +45,8 @@
 #include <gear_config.h>
 #include <libgearman-server/common.h>
 #include <libgearman-server/byte.h>
+#include <stdint.h>
+#include <inttypes.h>
 
 #include <libgearman-server/plugins/queue/postgres/queue.h>
 #include <libgearman-server/plugins/queue/base.h>
@@ -261,22 +263,24 @@
   (void)when;
   gearmand::plugins::queue::Postgres *queue= (gearmand::plugins::queue::Postgres *)context;
 
-  char buffer[22];
-  snprintf(buffer, sizeof(buffer), "%u", static_cast<uint32_t>(priority));
+  char priority_buffer[22];
+  snprintf(priority_buffer, sizeof(priority_buffer), "%u", static_cast<uint32_t>(priority));
+  char when_buffer[12];
+  snprintf(when_buffer, sizeof(when_buffer), "%" PRId64, when);
 
   const char *param_values[]= {
-    (char *)buffer,
+    (char *)priority_buffer,
     (char *)unique,
     (char *)function_name,
     (char *)data,
-    (char *)when };
+    (char *)when_buffer };
 
   int param_lengths[]= {
-    (int)strlen(buffer),
+    (int)strlen(priority_buffer),
     (int)unique_size,
     (int)function_name_size,
     (int)data_size,
-    (int)when };
+    (int)strlen(when_buffer) };
 
   int param_formats[] = { 0, 0, 0, 1, 0 };