Apply the patchset about for PRVENT result

CID 16837 desc_parser.c
CID 11671 livebox.c

Change-Id: If491697157e248c42770d18c1d0e6b2a12e2a897

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 730cc52..79acd4a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,4 +59,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkg
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox-viewer_PG.h DESTINATION /usr/share/doc/${PROJECT_NAME})
 
-#ADD_SUBDIRECTORY(data)
+#ADD_SUBDIRECTORY(live-viewer)

diff --git a/debian/changelog b/debian/changelog
index 677c69c..76eae93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livebox-viewer (0.3.14) unstable; urgency=low
+
+  * Git: slp/pkgs/l/livebox-viewer
+  * Tag: livebox-viewer_0.3.14
+
+ -- Sung-jae Park <nicesj.park@samsung.com>  Tue, 21 Aug 2012 13:16:02 +0900
+
+livebox-viewer (0.3.13) unstable; urgency=low
+
+  * Git: slp/pkgs/l/livebox-viewer
+  * Tag: livebox-viewer_0.3.13
+
+ -- Sung-jae Park <nicesj.park@samsung.com>  Tue, 21 Aug 2012 13:15:33 +0900
+
 livebox-viewer (0.3.12) unstable; urgency=low
 
   * Git: slp/pkgs/l/livebox-viewer

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 7acceb0..0668785 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-viewer
 Summary: Library for the development of a livebox viewer
-Version: 0.3.12
+Version: 0.3.14
 Release: 1
 Group: main/app
 License: Samsung Proprietary License

diff --git a/src/desc_parser.c b/src/desc_parser.c
index 9bdcca9..b707c5d 100644 (file)
--- a/src/desc_parser.c
+++ b/src/desc_parser.c
@@ -548,6 +548,7 @@ int parse_desc(struct livebox *handle, const char *descfile, int is_pd)
                        free(block->group);
                        free(block->id);
                        free(block);
+                       block = NULL;
 
                        state = UNKNOWN;
                        break;

diff --git a/src/livebox.c b/src/livebox.c
index 727c5b7..734b188 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -1631,7 +1631,7 @@ EAPI int livebox_text_emit_signal(struct livebox *handler, const char *emission,
                return -EINVAL;
        }
 
-       if ((handler->lb.type != _LB_TYPE_TEXT && !handler->pd.type != _PD_TYPE_TEXT) || handler->state != CREATE || !handler->id) {
+       if ((handler->lb.type != _LB_TYPE_TEXT && handler->pd.type != _PD_TYPE_TEXT) || handler->state != CREATE || !handler->id) {
                ErrPrint("Handler is not valid\n");
                return -EINVAL;
        }