port gcc 4.3.x warning fixes from trunk to this branch

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153743 f38db490-d61c-443f-a65b-d21fe96a405b

9 files changed, 394 insertions, 211 deletions

diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index 21092e631..b2d64b5ca 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -773,7 +773,9 @@ struct pval *ael2_parse(char *filename, int *errors)
 	my_file = strdup(filename);
 	stat(filename, &stats);
 	buffer = (char*)malloc(stats.st_size+2);
-	fread(buffer, 1, stats.st_size, fin);
+	if (fread(buffer, 1, stats.st_size, fin) != stats.st_size) {
+		ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno));
+	}			
 	buffer[stats.st_size]=0;
 	fclose(fin);
 
@@ -841,7 +843,9 @@ static void setup_filestack(char *fnamebuf2, int fnamebuf_siz, glob_t *globbuf,
 			struct stat stats;
 			stat(fnamebuf2, &stats);
 			buffer = (char*)malloc(stats.st_size+1);
-			fread(buffer, 1, stats.st_size, in1);
+			if (fread(buffer, 1, stats.st_size, in1) != stats.st_size) {
+				ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno));
+			}			
 			buffer[stats.st_size] = 0;
 			ast_log(LOG_NOTICE,"  --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size);
 			fclose(in1);
diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c
index f98e560ad..d8af39cee 100644
--- a/res/ael/ael.tab.c
+++ b/res/ael/ael.tab.c
@@ -648,16 +648,16 @@ static const yytype_uint16 yyrline[] =
      238,   239,   240,   243,   243,   253,   253,   260,   261,   262,
      263,   266,   267,   268,   271,   272,   273,   274,   275,   276,
      277,   278,   279,   282,   287,   291,   299,   304,   309,   318,
-     319,   320,   326,   331,   335,   343,   343,   347,   350,   353,
-     364,   365,   372,   373,   377,   381,   387,   388,   393,   401,
-     402,   406,   412,   421,   424,   425,   426,   429,   432,   435,
-     436,   437,   435,   443,   447,   448,   449,   450,   453,   453,
-     486,   487,   488,   489,   493,   496,   497,   500,   501,   504,
-     507,   511,   515,   519,   525,   526,   530,   533,   539,   539,
-     544,   552,   552,   563,   570,   573,   574,   577,   578,   581,
-     584,   585,   588,   592,   596,   602,   603,   606,   607,   608,
-     614,   619,   624,   625,   626,   628,   631,   632,   639,   640,
-     641,   644,   647
+     319,   320,   326,   336,   340,   348,   348,   352,   355,   358,
+     369,   370,   382,   383,   392,   401,   412,   413,   423,   436,
+     437,   446,   457,   466,   469,   470,   471,   474,   477,   480,
+     481,   482,   480,   488,   492,   493,   494,   495,   498,   498,
+     531,   532,   533,   534,   538,   541,   542,   545,   546,   549,
+     552,   556,   560,   564,   570,   571,   575,   578,   584,   584,
+     589,   597,   597,   608,   615,   618,   619,   622,   623,   626,
+     629,   630,   633,   637,   641,   647,   648,   651,   652,   653,
+     659,   664,   669,   670,   671,   682,   685,   686,   693,   694,
+     695,   698,   701
 };
 #endif
 
@@ -2411,19 +2411,24 @@ yyreduce:
   case 52:
 #line 326 "ael.y"
     {
-		asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str));
-		free((yyvsp[(1) - (5)].str));
-		free((yyvsp[(3) - (5)].str));
-		free((yyvsp[(5) - (5)].str)); ;}
+		if (asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (5)].str));
+			free((yyvsp[(3) - (5)].str));
+			free((yyvsp[(5) - (5)].str));
+		}
+	;}
     break;
 
   case 53:
-#line 331 "ael.y"
+#line 336 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 54:
-#line 335 "ael.y"
+#line 340 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (7)].str), &(yylsp[(1) - (7)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (7)].str), &(yylsp[(3) - (7)]));
@@ -2432,31 +2437,31 @@ yyreduce:
     break;
 
   case 55:
-#line 343 "ael.y"
+#line 348 "ael.y"
     { reset_parencount(parseio->scanner); ;}
     break;
 
   case 56:
-#line 343 "ael.y"
+#line 348 "ael.y"
     { (yyval.str) = (yyvsp[(3) - (4)].str); ;}
     break;
 
   case 57:
-#line 347 "ael.y"
+#line 352 "ael.y"
     {
 		(yyval.pval)= npval2(PV_IF, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
 		(yyval.pval)->u1.str = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 58:
-#line 350 "ael.y"
+#line 355 "ael.y"
     {
 		(yyval.pval) = npval2(PV_RANDOM, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
 		(yyval.pval)->u1.str=(yyvsp[(2) - (2)].str);;}
     break;
 
   case 59:
-#line 353 "ael.y"
+#line 358 "ael.y"
     {
 		(yyval.pval) = npval2(PV_IFTIME, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
 		(yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);
@@ -2464,95 +2469,135 @@ yyreduce:
     break;
 
   case 60:
-#line 364 "ael.y"
+#line 369 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str);;}
     break;
 
   case 61:
-#line 365 "ael.y"
+#line 370 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str));
-		free((yyvsp[(1) - (2)].str));
-		free((yyvsp[(2) - (2)].str));
-		prev_word = (yyval.str);;}
+		if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (2)].str));
+			free((yyvsp[(2) - (2)].str));
+			prev_word = (yyval.str);
+		}
+	;}
     break;
 
   case 62:
-#line 372 "ael.y"
+#line 382 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 63:
-#line 373 "ael.y"
+#line 383 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str));
-		free((yyvsp[(1) - (2)].str));
-		free((yyvsp[(2) - (2)].str)); ;}
+		if (asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (2)].str));
+			free((yyvsp[(2) - (2)].str));
+		}
+	;}
     break;
 
   case 64:
-#line 377 "ael.y"
+#line 392 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str));
-		free((yyvsp[(1) - (3)].str));
-		free((yyvsp[(3) - (3)].str)); ;}
+		if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (3)].str));
+			free((yyvsp[(3) - (3)].str));
+		}
+	;}
     break;
 
   case 65:
-#line 381 "ael.y"
+#line 401 "ael.y"
     {  /* there are often '&' in hints */
-		asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str));
-		free((yyvsp[(1) - (3)].str));
-		free((yyvsp[(3) - (3)].str));;}
+		if (asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (3)].str));
+			free((yyvsp[(3) - (3)].str));
+		}
+	;}
     break;
 
   case 66:
-#line 387 "ael.y"
+#line 412 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str);;}
     break;
 
   case 67:
-#line 388 "ael.y"
+#line 413 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str));
-		free((yyvsp[(1) - (2)].str));
-		free((yyvsp[(2) - (2)].str));
-		prev_word = (yyval.str);;}
+		if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (2)].str));
+			free((yyvsp[(2) - (2)].str));
+			prev_word = (yyval.str);
+		}			
+	;}
     break;
 
   case 68:
-#line 393 "ael.y"
+#line 423 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str));
-		free((yyvsp[(1) - (3)].str));
-		free((yyvsp[(2) - (3)].str));
-		free((yyvsp[(3) - (3)].str));
-		prev_word=(yyval.str);;}
+		if (asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (3)].str));
+			free((yyvsp[(2) - (3)].str));
+			free((yyvsp[(3) - (3)].str));
+			prev_word=(yyval.str);
+		}
+	;}
     break;
 
   case 69:
-#line 401 "ael.y"
+#line 436 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str);;}
     break;
 
   case 70:
-#line 402 "ael.y"
+#line 437 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str));
-		free((yyvsp[(1) - (2)].str));
-		free((yyvsp[(2) - (2)].str));;}
+		if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (2)].str));
+			free((yyvsp[(2) - (2)].str));
+		}
+	;}
     break;
 
   case 71:
-#line 406 "ael.y"
+#line 446 "ael.y"
     {
-		asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str));
-		free((yyvsp[(1) - (3)].str));
-		free((yyvsp[(3) - (3)].str));;}
+		if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			(yyval.str) = NULL;
+		} else {
+			free((yyvsp[(1) - (3)].str));
+			free((yyvsp[(3) - (3)].str));
+		}
+	;}
     break;
 
   case 72:
-#line 412 "ael.y"
+#line 457 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
 		(yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);
@@ -2560,60 +2605,60 @@ yyreduce:
     break;
 
   case 73:
-#line 421 "ael.y"
+#line 466 "ael.y"
     {
 		(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));;}
     break;
 
   case 74:
-#line 424 "ael.y"
+#line 469 "ael.y"
     { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
     break;
 
   case 75:
-#line 425 "ael.y"
+#line 470 "ael.y"
     { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
     break;
 
   case 76:
-#line 426 "ael.y"
+#line 471 "ael.y"
     {
 		(yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;}
     break;
 
   case 77:
-#line 429 "ael.y"
+#line 474 "ael.y"
     {
 		(yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;}
     break;
 
   case 78:
-#line 432 "ael.y"
+#line 477 "ael.y"
     {
 		(yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
 		(yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); ;}
     break;
 
   case 79:
-#line 435 "ael.y"
+#line 480 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
   case 80:
-#line 436 "ael.y"
+#line 481 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
   case 81:
-#line 437 "ael.y"
+#line 482 "ael.y"
     {reset_parencount(parseio->scanner);;}
     break;
 
   case 82:
-#line 437 "ael.y"
+#line 482 "ael.y"
     { /* XXX word_list maybe ? */
 		(yyval.pval) = npval2(PV_FOR, &(yylsp[(1) - (12)]), &(yylsp[(12) - (12)]));
 		(yyval.pval)->u1.for_init = (yyvsp[(4) - (12)].str);
@@ -2623,7 +2668,7 @@ yyreduce:
     break;
 
   case 83:
-#line 443 "ael.y"
+#line 488 "ael.y"
     {
 		(yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.str = (yyvsp[(2) - (3)].str);
@@ -2631,34 +2676,34 @@ yyreduce:
     break;
 
   case 84:
-#line 447 "ael.y"
+#line 492 "ael.y"
     { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
     break;
 
   case 85:
-#line 448 "ael.y"
+#line 493 "ael.y"
     { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); ;}
     break;
 
   case 86:
-#line 449 "ael.y"
+#line 494 "ael.y"
     { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 87:
-#line 450 "ael.y"
+#line 495 "ael.y"
     {
 		(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
 		(yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);;}
     break;
 
   case 88:
-#line 453 "ael.y"
+#line 498 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
   case 89:
-#line 453 "ael.y"
+#line 498 "ael.y"
     {
 		char *bufx;
 		int tot=0;
@@ -2695,22 +2740,22 @@ yyreduce:
     break;
 
   case 90:
-#line 486 "ael.y"
+#line 531 "ael.y"
     { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 91:
-#line 487 "ael.y"
+#line 532 "ael.y"
     { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 92:
-#line 488 "ael.y"
+#line 533 "ael.y"
     { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 93:
-#line 489 "ael.y"
+#line 534 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(2) - (3)]));
 		(yyval.pval)->u2.statements = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));
@@ -2718,41 +2763,41 @@ yyreduce:
     break;
 
   case 94:
-#line 493 "ael.y"
+#line 538 "ael.y"
     { (yyval.pval)=0; ;}
     break;
 
   case 95:
-#line 496 "ael.y"
+#line 541 "ael.y"
     { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;}
     break;
 
   case 96:
-#line 497 "ael.y"
+#line 542 "ael.y"
     { (yyval.pval) = NULL ; ;}
     break;
 
   case 97:
-#line 500 "ael.y"
+#line 545 "ael.y"
     { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
     break;
 
   case 98:
-#line 501 "ael.y"
+#line 546 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;}
     break;
 
   case 99:
-#line 504 "ael.y"
+#line 549 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;}
     break;
 
   case 100:
-#line 507 "ael.y"
+#line 552 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
@@ -2760,7 +2805,7 @@ yyreduce:
     break;
 
   case 101:
-#line 511 "ael.y"
+#line 556 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
@@ -2768,7 +2813,7 @@ yyreduce:
     break;
 
   case 102:
-#line 515 "ael.y"
+#line 560 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
@@ -2776,7 +2821,7 @@ yyreduce:
     break;
 
   case 103:
-#line 519 "ael.y"
+#line 564 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));
 		(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
@@ -2784,24 +2829,24 @@ yyreduce:
     break;
 
   case 104:
-#line 525 "ael.y"
+#line 570 "ael.y"
     { (yyval.str) = strdup("1"); ;}
     break;
 
   case 105:
-#line 526 "ael.y"
+#line 571 "ael.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 106:
-#line 530 "ael.y"
+#line 575 "ael.y"
     {			/* ext[, pri] default 1 */
 		(yyval.pval) = nword((yyvsp[(1) - (2)].str), &(yylsp[(1) - (2)]));
 		(yyval.pval)->next = nword((yyvsp[(2) - (2)].str), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 107:
-#line 533 "ael.y"
+#line 578 "ael.y"
     {	/* context, ext, pri */
 		(yyval.pval) = nword((yyvsp[(4) - (4)].str), &(yylsp[(4) - (4)]));
 		(yyval.pval)->next = nword((yyvsp[(1) - (4)].str), &(yylsp[(1) - (4)]));
@@ -2809,12 +2854,12 @@ yyreduce:
     break;
 
   case 108:
-#line 539 "ael.y"
+#line 584 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
   case 109:
-#line 539 "ael.y"
+#line 584 "ael.y"
     {
 		/* XXX original code had @2 but i think we need @5 */
 		(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
@@ -2823,19 +2868,19 @@ yyreduce:
     break;
 
   case 110:
-#line 544 "ael.y"
+#line 589 "ael.y"
     {
 		(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); ;}
     break;
 
   case 111:
-#line 552 "ael.y"
+#line 597 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
   case 112:
-#line 552 "ael.y"
+#line 597 "ael.y"
     {
 		if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) {
 			(yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(2) - (3)]));
@@ -2848,7 +2893,7 @@ yyreduce:
     break;
 
   case 113:
-#line 563 "ael.y"
+#line 608 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)]));
  		if( (yyval.pval)->type == PV_GOTO )
@@ -2859,49 +2904,49 @@ yyreduce:
     break;
 
   case 114:
-#line 570 "ael.y"
+#line 615 "ael.y"
     { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;}
     break;
 
   case 115:
-#line 573 "ael.y"
+#line 618 "ael.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str) ;}
     break;
 
   case 116:
-#line 574 "ael.y"
+#line 619 "ael.y"
     { (yyval.str) = strdup(""); ;}
     break;
 
   case 117:
-#line 577 "ael.y"
+#line 622 "ael.y"
     { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
     break;
 
   case 118:
-#line 578 "ael.y"
+#line 623 "ael.y"
     {
 		(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
 		(yyval.pval)->u1.str = strdup(""); ;}
     break;
 
   case 119:
-#line 581 "ael.y"
+#line 626 "ael.y"
     { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;}
     break;
 
   case 120:
-#line 584 "ael.y"
+#line 629 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 121:
-#line 585 "ael.y"
+#line 630 "ael.y"
     { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
     break;
 
   case 122:
-#line 588 "ael.y"
+#line 633 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CASE, &(yylsp[(1) - (4)]), &(yylsp[(3) - (4)])); /* XXX 3 or 4 ? */
 		(yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);
@@ -2909,7 +2954,7 @@ yyreduce:
     break;
 
   case 123:
-#line 592 "ael.y"
+#line 637 "ael.y"
     {
 		(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
 		(yyval.pval)->u1.str = NULL;
@@ -2917,7 +2962,7 @@ yyreduce:
     break;
 
   case 124:
-#line 596 "ael.y"
+#line 641 "ael.y"
     {
 		(yyval.pval) = npval2(PV_PATTERN, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); /* XXX@3 or @4 ? */
 		(yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);
@@ -2925,27 +2970,27 @@ yyreduce:
     break;
 
   case 125:
-#line 602 "ael.y"
+#line 647 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 126:
-#line 603 "ael.y"
+#line 648 "ael.y"
     { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
     break;
 
   case 127:
-#line 606 "ael.y"
+#line 651 "ael.y"
     {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
     break;
 
   case 128:
-#line 607 "ael.y"
+#line 652 "ael.y"
     { (yyval.pval)=(yyvsp[(1) - (1)].pval);;}
     break;
 
   case 129:
-#line 608 "ael.y"
+#line 653 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
 		(yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);
@@ -2953,47 +2998,56 @@ yyreduce:
     break;
 
   case 130:
-#line 614 "ael.y"
+#line 659 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));
 		(yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
     break;
 
   case 131:
-#line 619 "ael.y"
+#line 664 "ael.y"
     {
 		(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));
 		(yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
     break;
 
   case 132:
-#line 624 "ael.y"
+#line 669 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 133:
-#line 625 "ael.y"
+#line 670 "ael.y"
     { (yyval.pval) = linku1(nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])), (yyvsp[(3) - (3)].pval)); ;}
     break;
 
   case 134:
-#line 626 "ael.y"
-    { char *x; asprintf(&x,"%s@%s", (yyvsp[(1) - (5)].str),(yyvsp[(3) - (5)].str)); free((yyvsp[(1) - (5)].str)); free((yyvsp[(3) - (5)].str));
-									  (yyval.pval) = linku1(nword(x, &(yylsp[(1) - (5)])), (yyvsp[(5) - (5)].pval));;}
+#line 671 "ael.y"
+    {
+	  char *x;
+	  if (asprintf(&x,"%s@%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str)) < 0) {
+		ast_log(LOG_WARNING, "asprintf() failed\n");
+		(yyval.pval) = NULL;
+	  } else {
+		free((yyvsp[(1) - (5)].str));
+		free((yyvsp[(3) - (5)].str));
+		(yyval.pval) = linku1(nword(x, &(yylsp[(1) - (5)])), (yyvsp[(5) - (5)].pval));
+	  }
+	;}
     break;
 
   case 135:
-#line 628 "ael.y"
+#line 682 "ael.y"
     {(yyval.pval)=(yyvsp[(2) - (2)].pval);;}
     break;
 
   case 136:
-#line 631 "ael.y"
+#line 685 "ael.y"
     { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
     break;
 
   case 137:
-#line 632 "ael.y"
+#line 686 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
 		(yyval.pval)->u2.arglist = (yyvsp[(3) - (3)].pval);
@@ -3001,36 +3055,36 @@ yyreduce:
     break;
 
   case 138:
-#line 639 "ael.y"
+#line 693 "ael.y"
     { (yyval.pval) = (yyvsp[(1) - (2)].pval); ;}
     break;
 
   case 139:
-#line 640 "ael.y"
+#line 694 "ael.y"
     { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); ;}
     break;
 
   case 140:
-#line 641 "ael.y"
+#line 695 "ael.y"
     {(yyval.pval)=(yyvsp[(1) - (2)].pval);;}
     break;
 
   case 141:
-#line 644 "ael.y"
+#line 698 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
 		(yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
     break;
 
   case 142:
-#line 647 "ael.y"
+#line 701 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));;}
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 3034 "ael.tab.c"
+#line 3088 "ael.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3250,7 +3304,7 @@ yyreturn:
 }
 
 
-#line 652 "ael.y"
+#line 706 "ael.y"
 
 
 static char *token_equivs1[] =
diff --git a/res/ael/ael.y b/res/ael/ael.y
index fbdcdcc46..c412e3cdf 100644
--- a/res/ael/ael.y
+++ b/res/ael/ael.y
@@ -324,10 +324,15 @@ statements : /* empty */ { $$ = NULL; }
  * detect the '-' but only the ':' as separator
  */
 timerange: word3_list COLON word3_list COLON word3_list {
-		asprintf(&$$, "%s:%s:%s", $1, $3, $5);
-		free($1);
-		free($3);
-		free($5); }
+		if (asprintf(&$$, "%s:%s:%s", $1, $3, $5) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($3);
+			free($5);
+		}
+	}
 	| word { $$ = $1; }
 	;
 
@@ -363,50 +368,90 @@ if_like_head : KW_IF test_expr {
 
 word_list : word { $$ = $1;}
 	| word word {
-		asprintf(&($$), "%s%s", $1, $2);
-		free($1);
-		free($2);
-		prev_word = $$;}
+		if (asprintf(&($$), "%s%s", $1, $2) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($2);
+			prev_word = $$;
+		}
+	}
 	;
 
 hint_word : word { $$ = $1; }
 	| hint_word word {
-		asprintf(&($$), "%s %s", $1, $2);
-		free($1);
-		free($2); }
+		if (asprintf(&($$), "%s %s", $1, $2) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($2);
+		}
+	}
 	| hint_word COLON word {
-		asprintf(&($$), "%s:%s", $1, $3);
-		free($1);
-		free($3); }
+		if (asprintf(&($$), "%s:%s", $1, $3) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($3);
+		}
+	}
 	| hint_word AMPER word {  /* there are often '&' in hints */
-		asprintf(&($$), "%s&%s", $1, $3);
-		free($1);
-		free($3);}
-
+		if (asprintf(&($$), "%s&%s", $1, $3) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($3);
+		}
+	}
+	;
 
 word3_list : word { $$ = $1;}
 	| word word {
-		asprintf(&($$), "%s%s", $1, $2);
-		free($1);
-		free($2);
-		prev_word = $$;}
+		if (asprintf(&($$), "%s%s", $1, $2) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($2);
+			prev_word = $$;
+		}			
+	}
 	| word word word {
-		asprintf(&($$), "%s%s%s", $1, $2, $3);
-		free($1);
-		free($2);
-		free($3);
-		prev_word=$$;}
+		if (asprintf(&($$), "%s%s%s", $1, $2, $3) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($2);
+			free($3);
+			prev_word=$$;
+		}
+	}
 	;
 
 goto_word : word { $$ = $1;}
 	| word word {
-		asprintf(&($$), "%s%s", $1, $2);
-		free($1);
-		free($2);}
+		if (asprintf(&($$), "%s%s", $1, $2) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($2);
+		}
+	}
 	| goto_word COLON word {
-		asprintf(&($$), "%s:%s", $1, $3);
-		free($1);
-		free($3);}
+		if (asprintf(&($$), "%s:%s", $1, $3) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($3);
+		}
+	}
 	;
 
 switch_statement : KW_SWITCH test_expr LC case_statements RC {
@@ -623,8 +668,17 @@ eswitches : KW_ESWITCHES LC switchlist RC {
 
 switchlist : /* empty */ { $$ = NULL; }
 	| word SEMI switchlist { $$ = linku1(nword($1, &@1), $3); }
-	| word AT word SEMI switchlist { char *x; asprintf(&x,"%s@%s", $1,$3); free($1); free($3);
-									  $$ = linku1(nword(x, &@1), $5);}
+	| word AT word SEMI switchlist {
+	  char *x;
+	  if (asprintf(&x,"%s@%s", $1, $3) < 0) {
+		ast_log(LOG_WARNING, "asprintf() failed\n");
+		$$ = NULL;
+	  } else {
+		free($1);
+		free($3);
+		$$ = linku1(nword(x, &@1), $5);
+	  }
+	}
 	| error switchlist {$$=$2;}
 	;
 
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index 08284fd14..b774450d5 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -9,7 +9,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -32,7 +32,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -55,7 +55,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -86,6 +85,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -95,11 +96,12 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -135,8 +137,6 @@ typedef void* yyscan_t;
 #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
 #define yy_flex_debug yyg->yy_flex_debug_r
 
-int ael_yylex_init (yyscan_t* scanner);
-
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
@@ -194,14 +194,9 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -950,7 +945,7 @@ static void pbcwhere(const char *text, int *line, int *col )
 #define	STORE_POS
 #define	STORE_LOC
 #endif
-#line 953 "ael_lex.c"
+#line 948 "ael_lex.c"
 
 #define INITIAL 0
 #define paren 1
@@ -1019,6 +1014,10 @@ static int yy_init_globals (yyscan_t yyscanner );
     
     #    define yylloc yyg->yylloc_r
     
+int ael_yylex_init (yyscan_t* scanner);
+
+int ael_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
+
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
@@ -1098,7 +1097,7 @@ static int input (yyscan_t yyscanner );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1163,9 +1162,11 @@ static int input (yyscan_t yyscanner );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int ael_yylex (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+extern int ael_yylex \
+               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
 
-#define YY_DECL int ael_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+#define YY_DECL int ael_yylex \
+               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1195,7 +1196,7 @@ YY_DECL
 #line 208 "ael.flex"
 
 
-#line 1198 "ael_lex.c"
+#line 1199 "ael_lex.c"
 
     yylval = yylval_param;
 
@@ -2000,7 +2001,7 @@ YY_RULE_SETUP
 #line 622 "ael.flex"
 ECHO;
 	YY_BREAK
-#line 2003 "ael_lex.c"
+#line 2004 "ael_lex.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2231,7 +2232,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, num_to_read );
+			yyg->yy_n_chars, (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
 		}
@@ -2255,6 +2256,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ael_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	yyg->yy_n_chars += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
@@ -2683,7 +2692,9 @@ static void ael_yyensure_buffer_stack (yyscan_t yyscanner)
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)ael_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
-		
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in ael_yyensure_buffer_stack()" );
+								  
 		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		yyg->yy_buffer_stack_max = num_to_alloc;
@@ -2701,6 +2712,8 @@ static void ael_yyensure_buffer_stack (yyscan_t yyscanner)
 								(yyg->yy_buffer_stack,
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in ael_yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2745,7 +2758,7 @@ YY_BUFFER_STATE ael_yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yys
 
 /** Setup the input buffer state to scan a string. The next call to ael_yylex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -3019,6 +3032,42 @@ int ael_yylex_init(yyscan_t* ptr_yy_globals)
     return yy_init_globals ( *ptr_yy_globals );
 }
 
+/* ael_yylex_init_extra has the same functionality as ael_yylex_init, but follows the
+ * convention of taking the scanner as the last argument. Note however, that
+ * this is a *pointer* to a scanner, as it will be allocated by this call (and
+ * is the reason, too, why this function also must handle its own declaration).
+ * The user defined value in the first argument will be available to ael_yyalloc in
+ * the yyextra field.
+ */
+
+int ael_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
+
+{
+    struct yyguts_t dummy_yyguts;
+
+    ael_yyset_extra (yy_user_defined, &dummy_yyguts);
+
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+	
+    *ptr_yy_globals = (yyscan_t) ael_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
+	
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+    
+    /* By setting to 0xAA, we expose bugs in
+    yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+    
+    ael_yyset_extra (yy_user_defined, *ptr_yy_globals);
+    
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
 static int yy_init_globals (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
@@ -3281,7 +3330,9 @@ struct pval *ael2_parse(char *filename, int *errors)
 	my_file = strdup(filename);
 	stat(filename, &stats);
 	buffer = (char*)malloc(stats.st_size+2);
-	fread(buffer, 1, stats.st_size, fin);
+	if (fread(buffer, 1, stats.st_size, fin) != stats.st_size) {
+		ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno));
+	}			
 	buffer[stats.st_size]=0;
 	fclose(fin);
 
@@ -3349,7 +3400,9 @@ static void setup_filestack(char *fnamebuf2, int fnamebuf_siz, glob_t *globbuf,
 			struct stat stats;
 			stat(fnamebuf2, &stats);
 			buffer = (char*)malloc(stats.st_size+1);
-			fread(buffer, 1, stats.st_size, in1);
+			if (fread(buffer, 1, stats.st_size, in1) != stats.st_size) {
+				ast_log(LOG_ERROR, "fread() failed: %s\n", strerror(errno));
+			}			
 			buffer[stats.st_size] = 0;
 			ast_log(LOG_NOTICE,"  --Read in included file %s, %d chars\n",fnamebuf2, (int)stats.st_size);
 			fclose(in1);
diff --git a/res/res_agi.c b/res/res_agi.c
index e970f1715..2df15c4d8 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2656,7 +2656,8 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
 				/* If it's voice, write it to the audio pipe */
 				if ((agi->audio > -1) && (f->frametype == AST_FRAME_VOICE)) {
 					/* Write, ignoring errors */
-					write(agi->audio, f->data, f->datalen);
+					if (write(agi->audio, f->data, f->datalen) < 0) {
+					}
 				}
 				ast_frfree(f);
 			}
diff --git a/res/res_crypto.c b/res/res_crypto.c
index f1a2234fd..e55abe891 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -106,7 +106,11 @@ static int pw_cb(char *buf, int size, int rwflag, void *userdata)
 	
 	snprintf(prompt, sizeof(prompt), ">>>> passcode for %s key '%s': ",
 		 key->ktype == AST_KEY_PRIVATE ? "PRIVATE" : "PUBLIC", key->name);
-	write(key->outfd, prompt, strlen(prompt));
+	if (write(key->outfd, prompt, strlen(prompt)) < 0) {
+		ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
+		key->infd = -2;
+		return -1;
+	}
 	memset(buf, 0, sizeof(buf));
 	tmp = ast_hide_password(key->infd);
 	memset(buf, 0, size);
@@ -177,7 +181,9 @@ static struct ast_key *try_load_key(const char *dir, const char *fname, int ifd,
 	while(!feof(f)) {
 		/* Calculate a "whatever" quality md5sum of the key */
 		char buf[256] = "";
-		fgets(buf, sizeof(buf), f);
+		if (!fgets(buf, sizeof(buf), f)) {
+			continue;
+		}
 		if (!feof(f))
 			MD5Update(&md5, (unsigned char *) buf, strlen(buf));
 	}
diff --git a/res/res_jabber.c b/res/res_jabber.c
index ae24d7545..f2283b108 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -987,8 +987,7 @@ static int aji_act_hook(void *data, int type, iks *node)
 				sprintf(secret, "%s%s", pak->id, client->password);
 				ast_sha1_hash(shasum, secret);
 				handshake = NULL;
-				asprintf(&handshake, "<handshake>%s</handshake>", shasum);
-				if (handshake) {
+				if (asprintf(&handshake, "<handshake>%s</handshake>", shasum) >= 0) {
 					aji_send_raw(client, handshake);
 					ast_free(handshake);
 					handshake = NULL;
@@ -2755,8 +2754,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug)
 	}
 	if (!strchr(client->user, '/') && !client->component) { /*client */
 		resource = NULL;
-		asprintf(&resource, "%s/asterisk", client->user);
-		if (resource) {
+		if (asprintf(&resource, "%s/asterisk", client->user) >= 0) {
 			client->jid = iks_id_new(client->stack, resource);
 			ast_free(resource);
 		}
@@ -2772,8 +2770,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug)
 	}
 	if (!strchr(client->user, '/') && !client->component) { /*client */
 		resource = NULL;
-		asprintf(&resource, "%s/asterisk", client->user);
-		if (resource) {
+		if (asprintf(&resource, "%s/asterisk", client->user) >= 0) {
 			client->jid = iks_id_new(client->stack, resource);
 			ast_free(resource);
 		}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index ebb6050ec..1a7bea5a2 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -524,7 +524,10 @@ static int spawn_mp3(struct mohclass *class)
 			}
 		}
 		/* Child */
-		chdir(class->dir);
+		if (chdir(class->dir) < 0) {
+			ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
+			_exit(1);
+		}
 		if (ast_test_flag(class, MOH_CUSTOM)) {
 			execv(argv[0], argv);
 		} else {
@@ -936,8 +939,14 @@ static int moh_scan_files(struct mohclass *class) {
 
 	class->total_files = 0;
 	dirnamelen = strlen(class->dir) + 2;
-	getcwd(path, sizeof(path));
-	chdir(class->dir);
+	if (!getcwd(path, sizeof(path))) {
+		ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
+		return -1;
+	}
+	if (chdir(class->dir) < 0) {
+		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
+		return -1;
+	}
 	while ((files_dirent = readdir(files_DIR))) {
 		/* The file name must be at least long enough to have the file type extension */
 		if ((strlen(files_dirent->d_name) < 4))
@@ -974,7 +983,10 @@ static int moh_scan_files(struct mohclass *class) {
 	}
 
 	closedir(files_DIR);
-	chdir(path);
+	if (chdir(path) < 0) {
+		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
+		return -1;
+	}
 	if (ast_test_flag(class, MOH_SORTALPHA))
 		qsort(&class->filearray[0], class->total_files, sizeof(char *), moh_sort_compare);
 	return class->total_files;
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index f5d785643..ce7d10c71 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -368,7 +368,9 @@ static struct ast_str *phoneprov_callback(struct ast_tcptls_session_instance *se
 			ast_get_version(), buf, len, route->file->mime_type);
 		
 		while ((len = read(fd, buf, sizeof(buf))) > 0)
-			fwrite(buf, 1, len, ser->f);
+			if (fwrite(buf, 1, len, ser->f) != len) {
+				ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+			}
 
 		close(fd);
 		route = unref_route(route);