From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 19 Jan 2010 15:27:30 +0000 (+0100)
Subject: Fix bscan bug introduced with serialization change
X-Git-Tag: Release-5.0.0~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a7b6c2695edb937ce3de4d2f2dd62c075bcee567;p=bacula%2Fbacula

Fix bscan bug introduced with serialization change
---

diff --git a/bacula/src/lib/serial.c b/bacula/src/lib/serial.c
index 2de4edaf30..70d058ce3d 100644
--- a/bacula/src/lib/serial.c
+++ b/bacula/src/lib/serial.c
@@ -170,12 +170,12 @@ void serial_float64(uint8_t * * const ptr, const float64_t v)
     *ptr += sizeof(float64_t);
 }
 
-void serial_string(uint8_t * * const ptr, const char * const str, int max)
+void serial_string(uint8_t * * const ptr, const char * const str)
 {
    int i;                   
    char *dest = (char *)*ptr;
    char *src = (char *)str;
-   for (i=0; i<max && src[i] != 0;  i++) {
+   for (i=0; src[i] != 0;  i++) {
       dest[i] = src[i];
    }
    dest[i++] = 0;                  /* terminate output string */
diff --git a/bacula/src/lib/serial.h b/bacula/src/lib/serial.h
index 44ab51ed20..90fb93b913 100644
--- a/bacula/src/lib/serial.h
+++ b/bacula/src/lib/serial.h
@@ -41,7 +41,7 @@ extern void serial_int64(uint8_t * * ptr, int64_t v);
 extern void serial_uint64(uint8_t * * const ptr, const uint64_t v);
 extern void serial_btime(uint8_t * * const ptr, const btime_t v);
 extern void serial_float64(uint8_t * * const ptr, const float64_t v);
-extern void serial_string(uint8_t * * const ptr, const char * const str, int max);
+extern void serial_string(uint8_t * * const ptr, const char * const str);
 
 extern int16_t unserial_int16(uint8_t * * const ptr);
 extern uint16_t unserial_uint16(uint8_t * * const ptr);
@@ -125,7 +125,7 @@ extern void unserial_string(uint8_t * * const ptr, char * const str, int max);
 #define ser_buffer(x)   ser_bytes((x), (sizeof (x)))
 
 /* Binary string not requiring serialization */
-#define ser_string(x)   serial_string(&ser_ptr, (x), (int)sizeof(x))
+#define ser_string(x)   serial_string(&ser_ptr, (x))
 
 /*                         Unserialisation                  */
 
@@ -164,7 +164,10 @@ extern void unserial_string(uint8_t * * const ptr, char * const str, int max);
 /*  Binary byte stream not requiring serialisation (length obtained by sizeof)  */
 #define unser_buffer(x)  unser_bytes((x), (sizeof (x)))
 
-/* Binary string not requiring serialization */
-#define unser_string(x) unserial_string(&ser_ptr, (x), (int)sizeof(x))
+/* Binary string not requiring serialization (length obtained from max) */
+#define unser_nstring(x,max) unserial_string(&ser_ptr, (x), (int)(max))
+
+/*  Binary string not requiring serialisation (length obtained by sizeof)  */
+#define unser_string(x) unserial_string(&ser_ptr, (x), sizeof(x))
 
 #endif /* __SERIAL_H_ */