Attachment 924363 Details for Bug 1121496 – fix inadyn_ip.cache file log output segfault on startup

[patch] fix inadyn_ip.cache file log output segfault on startup

inadyn-mt-cache-00-02.24.40.patch (text/plain), 3.08 KB, created by Bryan Hoover on 2014-08-06 06:48:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Hoover

Created: 2014-08-06 06:48:00 UTC

Size: 3.08 KB

patch

obsolete

>diff -ur inadyn-mt.v.02.24.40/src/dyndns.c inadyn-mt.v.02.24.40_new/src/dyndns.c
>--- inadyn-mt.v.02.24.40/src/dyndns.c	2014-06-03 11:41:51.000000000 -0400
>+++ inadyn-mt.v.02.24.40_new/src/dyndns.c	2014-08-06 02:10:57.116902728 -0400
>@@ -1369,6 +1369,8 @@
> 	5/25/2014
> 		Very ugly parsing.  Will move ip cache function to own module, and write a proper parser.  Really.  I will.
> 		Stop looking at me like that.
>+	8/6/2014
>+		Fix so pivots on whether cache entries contain DDNS as per v.02.24.40 - that is, backward ip cache compat.
> */
> 
> static RC_TYPE read_ip_cache(DYN_DNS_CLIENT *p_dyndns)
>@@ -1386,7 +1388,9 @@
> 		char	*in_str;
> 		char	*ip;
> 		char	server[256];
>-                char   	*alias,ip_type[8],*ip_alias_type;
>+                char   	*alias;
>+		char	ip_type[8];	//dangerous - ip_type len could increase (but, not likely) - should be a constant in dyndns.h
>+		char	*ip_alias_type;
> 
> 		int	i=0;
> 		int	alias_count=0;
>@@ -1400,6 +1404,7 @@
> 
> 		DBG_PRINTF((LOG_WARNING, "W:" MODULE_TAG "Address, alias pairs read from cache file (%s):\n",p_dyndns->ip_cache));
> 
>+//subsequent calls are via a wrapper that destructs before calling here - so no memory leak
> 		memset(&p_dyndns->ip_cache_list,0,sizeof(IP_CACHE_LIST));
> 		memset(server,0,256);
> 
>@@ -1427,15 +1432,20 @@
> 			}
> 			else {
> 
>+//space or carriage return
>+
> 				if (ch==' ' && !is_got_space) { /*ip address*/
> 
>+//first space
> 					is_got_space=1;
> 
> 					strcpy(ip,in_str);
> 				}
> 				else {
> 
>-					if (is_got_space && ch=='\n') { /*server*/
>+//second space and \n
>+
>+					if (is_got_space && ch=='\n' && is_got_alias) { /*server*/
> 
> 						is_got_space=0;
> 						is_got_alias=0;
>@@ -1447,6 +1457,8 @@
> 					} 
> 					else {	/*alias*/
> 
>+//second space or \n
>+
> 						int	cache_count;
> 						
> 						/*
>@@ -1455,8 +1467,6 @@
> 							others will be false, and need is_update_pending true accordingly
> 						*/
> 
>-						is_got_alias=1;
>-
> 						set_update_state(p_dyndns,in_str,true);
> 
> 						alias_count++;
>@@ -1499,6 +1509,21 @@
> 						strcpy(p_dyndns->ip_cache_list.saved_ip_cache[cache_count].alias,alias);
> 						strcpy(p_dyndns->ip_cache_list.saved_ip_cache[cache_count].type,ip_type);
> 						strcpy(p_dyndns->ip_cache_list.saved_ip_cache[cache_count].ip_alias_type,ip_alias_type);
>+
>+						/*pre v.02.24.40 - no DDNS server listed in cache entry*/
>+						if (!(ch=='\n')) {
>+
>+							is_got_alias=1;
>+						}
>+						else {
>+
>+	                                                DBG_PRINTF((LOG_WARNING, "W:" MODULE_TAG "%s %s:%s...\n",ip,alias,ip_type));
>+
>+							is_got_space=0;
>+
>+							free(alias);
>+							free(ip_alias_type);
>+						}
> 					} 
> 					
> 				}
>diff -ur inadyn-mt.v.02.24.40/src/dyndns.h inadyn-mt.v.02.24.40_new/src/dyndns.h
>--- inadyn-mt.v.02.24.40/src/dyndns.h	2014-06-01 11:01:18.000000000 -0400
>+++ inadyn-mt.v.02.24.40_new/src/dyndns.h	2014-08-06 02:10:44.652529981 -0400
>@@ -75,7 +75,7 @@
> 
> #endif
> 
>-#define	DYNDNS_EXTRA_VERSION
>+#define	DYNDNS_EXTRA_VERSION "-cache_patch_00"
> 
> #define DYNDNS_VERSION_STRING	"02.24.40" DYNDNS_VERSION_SND DYNDNS_VERSION_THD DYNDNS_EXTRA_VERSION
> #define DYNDNS_AGENT_NAME	"inadyn-mt/" DYNDNS_VERSION_STRING

Actions: View | Diff

Attachments on bug 1121496: 924363 | 925011 | 925085