Revise the packet build(create) function.

Fix the bug of payload size calculation code

Change-Id: If55874bb41e3b45c2ab79384d7b35715346d956d

diff --git a/debian/changelog b/debian/changelog
index 4dd074c..e427870 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+com-core (0.0.3) unstable; urgency=low
+
+  * Git: slp/pkgs/c/com-core
+  * Tag: com-core_0.0.3
+
+ -- Sung-jae Park <nicesj.park@samsung.com>  Wed, 18 Jul 2012 16:37:44 +0900
+
 com-core (0.0.2) unstable; urgency=low
 
   * Git: slp/pkgs/c/com-core

diff --git a/packaging/libcom-core.spec b/packaging/libcom-core.spec
index fb5aa4a..377e841 100644 (file)
--- a/packaging/libcom-core.spec
+++ b/packaging/libcom-core.spec
@@ -1,6 +1,6 @@
 Name: libcom-core
 Summary: Library for the light-weight IPC 
-Version: 0.0.2
+Version: 0.0.3
 Release: 1
 Group: main/util
 License: Samsung Proprietary License

diff --git a/src/packet.c b/src/packet.c
index 0a50518..d511316 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -41,7 +41,7 @@ struct packet {
 
 EAPI const enum packet_type const packet_type(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return PACKET_ERROR;
 
        return packet->data->head.type;
@@ -49,7 +49,7 @@ EAPI const enum packet_type const packet_type(const struct packet *packet)
 
 EAPI const int const packet_version(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return PACKET_ERROR;
 
        return packet->data->head.version;
@@ -57,14 +57,14 @@ EAPI const int const packet_version(const struct packet *packet)
 
 EAPI const int const packet_header_size(void)
 {
-       struct data packet; /* Only for getting the size of header of packet */
+       struct data payload; /* Only for getting the size of header of packet */
 
-       return sizeof(packet.head);
+       return sizeof(payload.head);
 }
 
 EAPI const int const packet_size(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return -EINVAL;
 
        return sizeof(*packet->data) + packet->data->head.payload_size;
@@ -72,7 +72,7 @@ EAPI const int const packet_size(const struct packet *packet)
 
 EAPI const unsigned long const packet_seq(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return 0;
 
        return packet->data->head.seq;
@@ -80,7 +80,7 @@ EAPI const unsigned long const packet_seq(const struct packet *packet)
 
 EAPI const int const packet_payload_size(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return -EINVAL;
 
        return packet->data->head.payload_size;
@@ -88,7 +88,7 @@ EAPI const int const packet_payload_size(const struct packet *packet)
 
 EAPI const char * const packet_command(const struct packet *packet)
 {
-       if (!packet || packet->state != VALID)
+       if (!packet || packet->state != VALID || !packet->data)
                return NULL;
 
        return packet->data->head.command;
@@ -201,7 +201,7 @@ EAPI struct packet *packet_create_reply(const struct packet *packet, const char
                return NULL;
        }
 
-       payload_size = sizeof(*result) + BUFSIZ;
+       payload_size = sizeof(*result->data) + BUFSIZ;
        result->refcnt = 0;
        result->data = malloc(payload_size);
        if (!packet->data) {
@@ -215,7 +215,7 @@ EAPI struct packet *packet_create_reply(const struct packet *packet, const char
        result->data->head.seq = packet->data->head.seq;
        result->data->head.type = PACKET_ACK;
        result->data->head.version = packet->data->head.version;
-       strcpy(result->data->head.command, packet->data->head.command);
+       strcpy(result->data->head.command, packet->data->head.command); /* we don't need to use strncmp */
        result->data->head.payload_size = 0;
        payload_size -= sizeof(*result->data);
 
@@ -243,7 +243,7 @@ EAPI struct packet *packet_create(const char *cmd, const char *fmt, ...)
                return NULL;
        }
 
-       payload_size = sizeof(*packet) + BUFSIZ;
+       payload_size = sizeof(*packet->data) + BUFSIZ;
        packet->refcnt = 0;
        packet->data = malloc(payload_size);
        if (!packet->data) {
@@ -257,7 +257,7 @@ EAPI struct packet *packet_create(const char *cmd, const char *fmt, ...)
        packet->data->head.seq = s_info.seq++;
        packet->data->head.type = PACKET_REQ;
        packet->data->head.version = PACKET_VERSION;
-       strcpy(packet->data->head.command, cmd);
+       strncpy(packet->data->head.command, cmd, sizeof(packet->data->head.command));
        packet->data->head.payload_size = 0;
        payload_size -= sizeof(*packet->data); /*!< Usable payload size (except head size) */
 
@@ -285,7 +285,7 @@ EAPI struct packet *packet_create_noack(const char *cmd, const char *fmt, ...)
                return NULL;
        }
 
-       payload_size = sizeof(*result) + BUFSIZ;
+       payload_size = sizeof(*result->data) + BUFSIZ;
        result->refcnt = 0;
        result->data = malloc(payload_size);
        if (!result->data) {