RIO-8413: Check the iSocketRequestAO before use

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 6dae69f..a79f1e3 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "CORE_8.107.1.1"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1175433"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100111
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index e1031a0..0c4e96f 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "CORE_8.107.1.1"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1175433"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100111
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index fb276c0..d932072 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "CORE_8.107.1.1"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1175433"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100111
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/oscl/oscl/osclio/src/oscl_socket_method.h b/oscl/oscl/osclio/src/oscl_socket_method.h
index 6e5cbe6..273889c 100644 (file)
--- a/oscl/oscl/osclio/src/oscl_socket_method.h
+++ b/oscl/oscl/osclio/src/oscl_socket_method.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -186,12 +186,14 @@ inline void OsclSocketMethod::CancelMethod()
     //cancel the timeout if any
     Abort();
     //cancel the request to the socket server.
-    iSocketRequestAO->DoCancel();
+    if (iSocketRequestAO)
+        iSocketRequestAO->DoCancel();
 }
 
 inline void OsclSocketMethod::MethodDone()
 {
-    iSocketRequestAO->Abort();
+    if (iSocketRequestAO)
+        iSocketRequestAO->Abort();
 }
 
 #endif